From 55b8e3a83e1ed4917c8a992133d32dd728e5edb2 Mon Sep 17 00:00:00 2001 From: AkrionXxarr Date: Wed, 27 Feb 2013 10:11:45 -0800 Subject: [PATCH 1/6] Warning Resolutions --- action.cpp | 4 + gamemode.h | 12 +-- itype.h | 10 +-- iuse.h | 2 +- mission.h | 4 +- monattack.h | 2 +- mtype.h | 2 +- npc.h | 8 +- omdata.h | 4 +- pldata.h | 4 +- settlement.h | 2 +- trap.h | 14 +-- veh_type.h | 240 +++++++++++++++++++++++++-------------------------- vehicle.h | 2 +- 14 files changed, 157 insertions(+), 153 deletions(-) diff --git a/action.cpp b/action.cpp index d43f6304ccfb9..115e91c78fff1 100644 --- a/action.cpp +++ b/action.cpp @@ -231,6 +231,8 @@ std::string action_ident(action_id act) return "debug_mode"; case ACTION_NULL: return "null"; + case NUM_ACTIONS: + // Unused. Added for completeness. } return "unknown"; } @@ -389,6 +391,8 @@ std::string action_name(action_id act) return "Toggle Debug Messages"; case ACTION_NULL: return "No Action"; + case NUM_ACTIONS: + // Unused. Added for completeness. } return "Someone forgot to name an action."; } diff --git a/gamemode.h b/gamemode.h index d3a3d30b16072..42df0abdc0333 100644 --- a/gamemode.h +++ b/gamemode.h @@ -24,16 +24,16 @@ struct special_game { virtual special_game_id id() { return SGAME_NULL; }; // init is run when the game begins - virtual bool init(game *g) { return true; }; + virtual bool init(game *) { return true; }; // per_turn is run every turn--before any player actions - virtual void per_turn(game *g) { }; + virtual void per_turn(game *) { }; // pre_action is run after a keypress, but before the game handles the action // It may modify the action, e.g. to cancel it - virtual void pre_action(game *g, action_id &act) { }; + virtual void pre_action(game *, action_id &) { }; // post_action is run after the game handles the action - virtual void post_action(game *g, action_id act) { }; + virtual void post_action(game *, action_id) { }; // game_over is run when the player dies (or the game otherwise ends) - virtual void game_over(game *g) { }; + virtual void game_over(game *) { }; }; @@ -71,7 +71,7 @@ struct tutorial_game : public special_game virtual void per_turn(game *g); virtual void pre_action(game *g, action_id &act); virtual void post_action(game *g, action_id act); - virtual void game_over(game *g) { }; + virtual void game_over(game *) { }; private: void add_message(game *g, tut_lesson lesson); diff --git a/itype.h b/itype.h index a8bee390962db..e8ba62fc78c00 100644 --- a/itype.h +++ b/itype.h @@ -568,7 +568,7 @@ struct it_var_veh_part: public itype char psym, nc_color pcolor, material pm1, material pm2, unsigned short pvolume, unsigned short pweight, signed char pmelee_dam, signed char pmelee_cut, signed char pm_to_hit, - unsigned effects, + unsigned, unsigned int big_min, unsigned int big_max, @@ -966,15 +966,15 @@ struct it_artifact_tool : public it_tool " " << int(m_to_hit) << " " << int(item_flags) << " " << int(charge_type) << " " << max_charges << " " << effects_wielded.size(); - for (int i = 0; i < effects_wielded.size(); i++) + for (unsigned int i = 0; i < effects_wielded.size(); i++) data << " " << int(effects_wielded[i]); data << " " << effects_activated.size(); - for (int i = 0; i < effects_activated.size(); i++) + for (unsigned int i = 0; i < effects_activated.size(); i++) data << " " << int(effects_activated[i]); data << " " << effects_carried.size(); - for (int i = 0; i < effects_carried.size(); i++) + for (unsigned int i = 0; i < effects_carried.size(); i++) data << " " << int(effects_carried[i]); data << " " << name << " - "; @@ -1026,7 +1026,7 @@ struct it_artifact_armor : public it_armor int(covers) << " " << int(encumber) << " " << int(dmg_resist) << " " << int(cut_resist) << " " << int(env_resist) << " " << int(warmth) << " " << int(storage) << " " << effects_worn.size(); - for (int i = 0; i < effects_worn.size(); i++) + for (unsigned int i = 0; i < effects_worn.size(); i++) data << " " << int(effects_worn[i]); data << " " << name << " - "; diff --git a/iuse.h b/iuse.h index cc8b5213c1067..182178c795882 100644 --- a/iuse.h +++ b/iuse.h @@ -8,7 +8,7 @@ class player; class iuse { public: - void none (game *g, player *p, item *it, bool t) { }; + void none (game *, player *, item *, bool ) { }; // FOOD AND DRUGS (ADMINISTRATION) void sewage (game *g, player *p, item *it, bool t); diff --git a/mission.h b/mission.h index 1b61ba3c8f29a..86fd06a02daff 100644 --- a/mission.h +++ b/mission.h @@ -47,8 +47,8 @@ enum mission_goal { }; struct mission_place { // Return true if [posx,posy] is valid in overmap - bool never (game *g, int posx, int posy) { return false; } - bool always (game *g, int posx, int posy) { return true; } + bool never (game *, int, int) { return false; } + bool always (game *, int, int) { return true; } bool near_town (game *g, int posx, int posy); }; diff --git a/monattack.h b/monattack.h index e56d17905b7e5..a69478808f287 100644 --- a/monattack.h +++ b/monattack.h @@ -8,7 +8,7 @@ class game; class mattack { public: - void none (game *g, monster *z) { }; + void none (game *, monster *) { }; void antqueen (game *g, monster *z); void shriek (game *g, monster *z); void acid (game *g, monster *z); diff --git a/mtype.h b/mtype.h index 80b1702b5d85a..e11f31a82f2b1 100644 --- a/mtype.h +++ b/mtype.h @@ -269,7 +269,7 @@ struct mtype { bool has_flag(m_flag flag) { - for (int i = 0; i < flags.size(); i++) { + for (unsigned int i = 0; i < flags.size(); i++) { if (flags[i] == flag) return true; } diff --git a/npc.h b/npc.h index 9413585fc96f5..f2356e59c8099 100644 --- a/npc.h +++ b/npc.h @@ -184,7 +184,7 @@ struct npc_opinion anger = copy.anger; owed = copy.owed; favors.clear(); - for (int i = 0; i < copy.favors.size(); i++) + for (unsigned int i = 0; i < copy.favors.size(); i++) favors.push_back( copy.favors[i] ); }; @@ -220,7 +220,7 @@ struct npc_opinion std::stringstream ret; ret << trust << " " << fear << " " << value << " " << anger << " " << owed << " " << favors.size(); - for (int i = 0; i < favors.size(); i++) + for (unsigned int i = 0; i < favors.size(); i++) ret << " " << int(favors[i].type) << " " << favors[i].value << " " << favors[i].item_id << " " << favors[i].skill->id(); return ret.str(); @@ -363,9 +363,9 @@ struct npc_chatbin std::stringstream ret; ret << first_topic << " " << mission_selected << " " << tempvalue << " " << missions.size() << " " << missions_assigned.size(); - for (int i = 0; i < missions.size(); i++) + for (unsigned int i = 0; i < missions.size(); i++) ret << " " << missions[i]; - for (int i = 0; i < missions_assigned.size(); i++) + for (unsigned int i = 0; i < missions_assigned.size(); i++) ret << " " << missions_assigned[i]; return ret.str(); } diff --git a/omdata.h b/omdata.h index cc3208ddd0138..b73b557e8be22 100644 --- a/omdata.h +++ b/omdata.h @@ -379,8 +379,8 @@ NUM_OMS_FLAGS struct omspec_place { // Able functions - true if p is valid - bool never (overmap *om, point p) { return false; } - bool always (overmap *om, point p) { return true; } + bool never (overmap *, point) { return false; } + bool always (overmap *, point) { return true; } bool water (overmap *om, point p); // Only on rivers bool land (overmap *om, point p); // Only on land (no rivers) bool forest (overmap *om, point p); // Forest diff --git a/pldata.h b/pldata.h index e9ece921a8371..384a188276741 100644 --- a/pldata.h +++ b/pldata.h @@ -128,7 +128,7 @@ struct player_activity index = copy.index; placement = copy.placement; values.clear(); - for (int i = 0; i < copy.values.size(); i++) + for (unsigned int i = 0; i < copy.values.size(); i++) values.push_back(copy.values[i]); } @@ -137,7 +137,7 @@ struct player_activity std::stringstream ret; ret << type << " " << moves_left << " " << index << " " << placement.x << " " << placement.y << " " << values.size(); - for (int i = 0; i < values.size(); i++) + for (unsigned int i = 0; i < values.size(); i++) ret << " " << values[i]; return ret.str(); diff --git a/settlement.h b/settlement.h index 7a05f0fc13bcb..3d75a18097e27 100644 --- a/settlement.h +++ b/settlement.h @@ -11,7 +11,7 @@ struct settlement { settlement(int mapx, int mapy); void pick_faction(game *g, int omx, int omy); void set_population(); - void populate(game *g) { }; + void populate(game *) { }; int num(oter_id ter); void add_building(oter_id ter); diff --git a/trap.h b/trap.h index 9e1eac28d01fa..860064c4532c9 100644 --- a/trap.h +++ b/trap.h @@ -46,10 +46,10 @@ enum trap_id { struct trap; struct trapfunc { - void none (game *g, int x, int y) { }; + void none (game *, int, int) { }; void bubble (game *g, int x, int y); void beartrap (game *g, int x, int y); - void snare (game *g, int x, int y) { }; + void snare (game *, int, int) { }; void board (game *g, int x, int y); void tripwire (game *g, int x, int y); void crossbow (game *g, int x, int y); @@ -63,7 +63,7 @@ struct trapfunc { void pit (game *g, int x, int y); void pit_spikes (game *g, int x, int y); void lava (game *g, int x, int y); - void portal (game *g, int x, int y) { }; + void portal (game *, int, int) { }; void ledge (game *g, int x, int y); void boobytrap (game *g, int x, int y); void temple_flood (game *g, int x, int y); @@ -76,7 +76,7 @@ struct trapfunc { }; struct trapfuncm { - void none (game *g, monster *z, int x, int y) { }; + void none (game *, monster *, int , int) { }; void bubble (game *g, monster *z, int x, int y); void cot (game *g, monster *z, int x, int y); void beartrap (game *g, monster *z, int x, int y); @@ -85,16 +85,16 @@ struct trapfuncm { void crossbow (game *g, monster *z, int x, int y); void shotgun (game *g, monster *z, int x, int y); void blade (game *g, monster *z, int x, int y); - void snare (game *g, monster *z, int x, int y) { }; + void snare (game *, monster *, int, int) { }; void landmine (game *g, monster *z, int x, int y); void telepad (game *g, monster *z, int x, int y); void goo (game *g, monster *z, int x, int y); void dissector (game *g, monster *z, int x, int y); - void sinkhole (game *g, monster *z, int x, int y) { }; + void sinkhole (game *, monster *, int, int) { }; void pit (game *g, monster *z, int x, int y); void pit_spikes(game *g, monster *z, int x, int y); void lava (game *g, monster *z, int x, int y); - void portal (game *g, monster *z, int x, int y) { }; + void portal (game *, monster *, int, int) { }; void ledge (game *g, monster *z, int x, int y); void boobytrap (game *g, monster *z, int x, int y); void glow (game *g, monster *z, int x, int y); diff --git a/veh_type.h b/veh_type.h index 46fd57cbbf162..6d126a48dc249 100644 --- a/veh_type.h +++ b/veh_type.h @@ -154,134 +154,134 @@ struct vpart_info // h, j, c to horizontal, vertical, cross correspondingly const vpart_info vpart_list[num_vparts] = { // name sym color sym_b color_b dmg dur par1 par2 item - { "null part", '?', c_red, '?', c_red, 100, 100, 0, 0, itm_null, 0, - 0 }, - { "seat", '#', c_red, '*', c_red, 60, 300, 0, 0, itm_seat, 1, - mfb(vpf_over) | mfb(vpf_seat) | mfb(vpf_cargo) | mfb(vpf_no_reinforce) }, - { "bed", '#', c_magenta, '*', c_magenta, 60, 300, 0, 0, itm_seat, 1, - mfb(vpf_over) | mfb(vpf_bed) | mfb(vpf_cargo) | mfb(vpf_no_reinforce) }, - { "frame", 'h', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "frame", 'j', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "frame", 'c', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "frame", 'y', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "frame", 'u', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "frame", 'n', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "frame", 'b', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "frame", '=', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "frame", 'H', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "frame", '^', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "handle", '^', c_ltcyan, '#', c_ltcyan, 100, 300, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, - { "board", 'h', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, - { "board", 'j', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, - { "board", 'y', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, - { "board", 'u', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, - { "board", 'n', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, - { "board", 'b', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, - { "roof", '#', c_ltgray, '#', c_dkgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_internal) | mfb(vpf_roof) }, - { "door", '+', c_cyan, '&', c_cyan, 80, 200, 0, 0, itm_frame, 2, - mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_openable) }, - { "opaque door",'+', c_cyan, '&', c_cyan, 80, 200, 0, 0, itm_frame, 2, - mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_opaque) | mfb(vpf_openable) }, - { "internal door", '+', c_cyan, '&', c_cyan, 75, 75, 0, 0, itm_frame, 2, - mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_opaque) | mfb(vpf_openable) | mfb(vpf_roof) | mfb(vpf_no_reinforce) }, - { "windshield", '"', c_ltcyan, '0', c_ltgray, 70, 50, 0, 0, itm_glass_sheet, 1, - mfb(vpf_over) | mfb(vpf_obstacle) | mfb(vpf_no_reinforce) }, - { "blade", '-', c_white, 'x', c_white, 250, 100, 0, 0, itm_carblade, 2, - mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }, - { "blade", '|', c_white, 'x', c_white, 350, 100, 0, 0, itm_carblade, 2, - mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }, - { "spike", '.', c_white, 'x', c_white, 300, 100, 0, 0, itm_carspike, 2, - mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }, + {{ "null part", '?', c_red, '?', c_red, 100, 100, 0, 0, itm_null, 0, + 0 }}, + {{ "seat", '#', c_red, '*', c_red, 60, 300, 0, 0, itm_seat, 1, + mfb(vpf_over) | mfb(vpf_seat) | mfb(vpf_cargo) | mfb(vpf_no_reinforce) }}, + {{ "bed", '#', c_magenta, '*', c_magenta, 60, 300, 0, 0, itm_seat, 1, + mfb(vpf_over) | mfb(vpf_bed) | mfb(vpf_cargo) | mfb(vpf_no_reinforce) }}, + {{ "frame", 'h', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "frame", 'j', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "frame", 'c', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "frame", 'y', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "frame", 'u', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "frame", 'n', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "frame", 'b', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "frame", '=', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "frame", 'H', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "frame", '^', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "handle", '^', c_ltcyan, '#', c_ltcyan, 100, 300, 0, 0, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, + {{ "board", 'h', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, + {{ "board", 'j', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, + {{ "board", 'y', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, + {{ "board", 'u', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, + {{ "board", 'n', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, + {{ "board", 'b', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, + {{ "roof", '#', c_ltgray, '#', c_dkgray, 100, 1000, 0, 0, itm_steel_plate, 1, + mfb(vpf_internal) | mfb(vpf_roof) }}, + {{ "door", '+', c_cyan, '&', c_cyan, 80, 200, 0, 0, itm_frame, 2, + mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_openable) }}, + {{ "opaque door",'+', c_cyan, '&', c_cyan, 80, 200, 0, 0, itm_frame, 2, + mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_opaque) | mfb(vpf_openable) }}, + {{ "internal door", '+', c_cyan, '&', c_cyan, 75, 75, 0, 0, itm_frame, 2, + mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_opaque) | mfb(vpf_openable) | mfb(vpf_roof) | mfb(vpf_no_reinforce) }}, + {{ "windshield", '"', c_ltcyan, '0', c_ltgray, 70, 50, 0, 0, itm_glass_sheet, 1, + mfb(vpf_over) | mfb(vpf_obstacle) | mfb(vpf_no_reinforce) }}, + {{ "blade", '-', c_white, 'x', c_white, 250, 100, 0, 0, itm_carblade, 2, + mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }}, + {{ "blade", '|', c_white, 'x', c_white, 350, 100, 0, 0, itm_carblade, 2, + mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }}, + {{ "spike", '.', c_white, 'x', c_white, 300, 100, 0, 0, itm_carspike, 2, + mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }}, // wheel_width(inches) - { "wheel", '0', c_dkgray, 'x', c_ltgray, 50, 200, 9, 0, itm_wheel, 4, - mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }, - { "wide wheel", 'O', c_dkgray, 'x', c_ltgray, 50, 400, 14, 0, itm_wheel_wide, 5, - mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }, - { "bicycle wheel",'|', c_dkgray, 'x', c_ltgray, 50, 40, 2, 0, itm_wheel_bicycle, 1, - mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }, - { "motorbike wheel",'o',c_dkgray, 'x', c_ltgray, 50, 90, 4, 0, itm_wheel_motorbike, 2, - mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }, - { "small wheel", 'o',c_dkgray, 'x', c_ltgray, 50, 70, 6, 0, itm_wheel_small, 2, - mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }, + {{ "wheel", '0', c_dkgray, 'x', c_ltgray, 50, 200, 9, 0, itm_wheel, 4, + mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }}, + {{ "wide wheel", 'O', c_dkgray, 'x', c_ltgray, 50, 400, 14, 0, itm_wheel_wide, 5, + mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }}, + {{ "bicycle wheel",'|', c_dkgray, 'x', c_ltgray, 50, 40, 2, 0, itm_wheel_bicycle, 1, + mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }}, + {{ "motorbike wheel",'o',c_dkgray, 'x', c_ltgray, 50, 90, 4, 0, itm_wheel_motorbike, 2, + mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }}, + {{ "small wheel", 'o',c_dkgray, 'x', c_ltgray, 50, 70, 6, 0, itm_wheel_small, 2, + mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }}, // - { "1-cylinder engine", '*', c_ltred, '#', c_red, 80, 150, 40, AT_GAS, itm_1cyl_combustion, 2, - mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }, - { "V-twin engine", '*', c_ltred, '#', c_red, 80, 200, 120, AT_GAS, itm_v2_combustion, 2, - mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }, - { "Inline-4 engine", '*', c_ltred, '#', c_red, 80, 300, 300, AT_GAS, itm_i4_combustion, 3, - mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }, - { "V6 engine", '*', c_ltred, '#', c_red, 80, 400, 800, AT_GAS, itm_v6_combustion, 4, - mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }, - { "V8 engine", '*', c_ltred, '#', c_red, 80, 400, 800, AT_GAS, itm_v8_combustion, 4, - mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }, - { "electric motor", '*', c_yellow, '#', c_red, 80, 200, 70, AT_BATT, itm_motor, 3, - mfb(vpf_internal) | mfb(vpf_engine) }, - { "large electric motor", '*', c_yellow, '#', c_red, 80, 400, 350, AT_BATT, itm_motor_large, 4, - mfb(vpf_internal) | mfb(vpf_engine) }, - { "plasma engine", '*', c_ltblue, '#', c_red, 80, 250, 400, AT_PLASMA, itm_plasma_engine, 6, - mfb(vpf_internal) | mfb(vpf_engine) }, - { "Foot pedals", '*', c_ltgray, '#', c_red, 50, 50, 70, AT_MUSCLE, itm_foot_crank, 1, - mfb(vpf_internal) | mfb(vpf_engine) }, + {{ "1-cylinder engine", '*', c_ltred, '#', c_red, 80, 150, 40, AT_GAS, itm_1cyl_combustion, 2, + mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }}, + {{ "V-twin engine", '*', c_ltred, '#', c_red, 80, 200, 120, AT_GAS, itm_v2_combustion, 2, + mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }}, + {{ "Inline-4 engine", '*', c_ltred, '#', c_red, 80, 300, 300, AT_GAS, itm_i4_combustion, 3, + mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }}, + {{ "V6 engine", '*', c_ltred, '#', c_red, 80, 400, 800, AT_GAS, itm_v6_combustion, 4, + mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }}, + {{ "V8 engine", '*', c_ltred, '#', c_red, 80, 400, 800, AT_GAS, itm_v8_combustion, 4, + mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }}, + {{ "electric motor", '*', c_yellow, '#', c_red, 80, 200, 70, AT_BATT, itm_motor, 3, + mfb(vpf_internal) | mfb(vpf_engine) }}, + {{ "large electric motor", '*', c_yellow, '#', c_red, 80, 400, 350, AT_BATT, itm_motor_large, 4, + mfb(vpf_internal) | mfb(vpf_engine) }}, + {{ "plasma engine", '*', c_ltblue, '#', c_red, 80, 250, 400, AT_PLASMA, itm_plasma_engine, 6, + mfb(vpf_internal) | mfb(vpf_engine) }}, + {{ "Foot pedals", '*', c_ltgray, '#', c_red, 50, 50, 70, AT_MUSCLE, itm_foot_crank, 1, + mfb(vpf_internal) | mfb(vpf_engine) }}, // capacity type - { "gasoline tank", 'O', c_ltred, '#', c_red, 80, 150, 3000, AT_GAS, itm_metal_tank, 1, - mfb(vpf_internal) | mfb(vpf_fuel_tank) }, - { "storage battery", 'O', c_yellow, '#', c_red, 80, 300, 1000, AT_BATT, itm_storage_battery, 2, - mfb(vpf_internal) | mfb(vpf_fuel_tank) }, - { "minireactor", 'O', c_ltgreen, '#', c_red, 80, 700, 10000, AT_PLUT, itm_minireactor, 7, - mfb(vpf_internal) | mfb(vpf_fuel_tank) }, - { "hydrogene tank", 'O', c_ltblue, '#', c_red, 80, 150, 3000, AT_PLASMA, itm_metal_tank, 1, - mfb(vpf_internal) | mfb(vpf_fuel_tank) }, - { "trunk", 'H', c_brown, '#', c_brown, 80, 300, 400, 0, itm_frame, 1, - mfb(vpf_over) | mfb(vpf_cargo) }, - { "box", 'o', c_brown, '#', c_brown, 60, 100, 400, 0, itm_frame, 1, - mfb(vpf_over) | mfb(vpf_cargo) }, + {{ "gasoline tank", 'O', c_ltred, '#', c_red, 80, 150, 3000, AT_GAS, itm_metal_tank, 1, + mfb(vpf_internal) | mfb(vpf_fuel_tank) }}, + {{ "storage battery", 'O', c_yellow, '#', c_red, 80, 300, 1000, AT_BATT, itm_storage_battery, 2, + mfb(vpf_internal) | mfb(vpf_fuel_tank) }}, + {{ "minireactor", 'O', c_ltgreen, '#', c_red, 80, 700, 10000, AT_PLUT, itm_minireactor, 7, + mfb(vpf_internal) | mfb(vpf_fuel_tank) }}, + {{ "hydrogene tank", 'O', c_ltblue, '#', c_red, 80, 150, 3000, AT_PLASMA, itm_metal_tank, 1, + mfb(vpf_internal) | mfb(vpf_fuel_tank) }}, + {{ "trunk", 'H', c_brown, '#', c_brown, 80, 300, 400, 0, itm_frame, 1, + mfb(vpf_over) | mfb(vpf_cargo) }}, + {{ "box", 'o', c_brown, '#', c_brown, 60, 100, 400, 0, itm_frame, 1, + mfb(vpf_over) | mfb(vpf_cargo) }}, - { "controls", '$', c_ltgray, '$', c_red, 10, 250, 0, 0, itm_vehicle_controls, 3, - mfb(vpf_internal) | mfb(vpf_controls) }, + {{ "controls", '$', c_ltgray, '$', c_red, 10, 250, 0, 0, itm_vehicle_controls, 3, + mfb(vpf_internal) | mfb(vpf_controls) }}, // bonus - { "muffler", '/', c_ltgray, '/', c_ltgray, 10, 150, 40, 0, itm_muffler, 2, - mfb(vpf_internal) | mfb(vpf_muffler) }, - { "seatbelt", ',', c_ltgray, ',', c_red, 10, 200, 25, 0, itm_rope_6, 1, - mfb(vpf_internal) | mfb(vpf_seatbelt) }, - { "solar panel", '#', c_yellow, 'x', c_yellow, 10, 20, 30, 0, itm_solar_panel, 6, - mfb(vpf_over) | mfb(vpf_solar_panel) }, + {{ "muffler", '/', c_ltgray, '/', c_ltgray, 10, 150, 40, 0, itm_muffler, 2, + mfb(vpf_internal) | mfb(vpf_muffler) }}, + {{ "seatbelt", ',', c_ltgray, ',', c_red, 10, 200, 25, 0, itm_rope_6, 1, + mfb(vpf_internal) | mfb(vpf_seatbelt) }}, + {{ "solar panel", '#', c_yellow, 'x', c_yellow, 10, 20, 30, 0, itm_solar_panel, 6, + mfb(vpf_over) | mfb(vpf_solar_panel) }}, - { "mounted M249", 't', c_cyan, '#', c_cyan, 80, 400, 0, AT_223, itm_m249, 6, - mfb(vpf_over) | mfb(vpf_turret) | mfb(vpf_cargo) }, - { "mounted flamethrower", 't', c_dkgray, '#', c_dkgray, 80, 400, 0, AT_GAS, itm_flamethrower, 7, - mfb(vpf_over) | mfb(vpf_turret) }, - { "mounted plasma gun", 't', c_ltblue, '#', c_ltblue, 80, 400, 0, AT_PLASMA, itm_plasma_rifle, 7, - mfb(vpf_over) | mfb(vpf_turret) }, + {{ "mounted M249", 't', c_cyan, '#', c_cyan, 80, 400, 0, AT_223, itm_m249, 6, + mfb(vpf_over) | mfb(vpf_turret) | mfb(vpf_cargo) }}, + {{ "mounted flamethrower", 't', c_dkgray, '#', c_dkgray, 80, 400, 0, AT_GAS, itm_flamethrower, 7, + mfb(vpf_over) | mfb(vpf_turret) }}, + {{ "mounted plasma gun", 't', c_ltblue, '#', c_ltblue, 80, 400, 0, AT_PLASMA, itm_plasma_rifle, 7, + mfb(vpf_over) | mfb(vpf_turret) }}, - { "steel plating", ')', c_ltcyan, ')', c_ltcyan, 100, 1000, 0, 0, itm_steel_plate, 3, - mfb(vpf_internal) | mfb(vpf_armor) }, - { "superalloy plating",')', c_dkgray, ')', c_dkgray, 100, 900, 0, 0, itm_alloy_plate, 4, - mfb(vpf_internal) | mfb(vpf_armor) }, - { "spiked plating", ')', c_red, ')', c_red, 150, 900, 0, 0, itm_spiked_plate, 3, - mfb(vpf_internal) | mfb(vpf_armor) | mfb(vpf_sharp) }, - { "hard plating", ')', c_cyan, ')', c_cyan, 100, 2300, 0, 0, itm_hard_plate, 4, - mfb(vpf_internal) | mfb(vpf_armor) }, - { "head light", '*', c_white, '*', c_white, 10, 20, 120, 0, itm_flashlight, 1, - mfb(vpf_internal) | mfb(vpf_light) } + {{ "steel plating", ')', c_ltcyan, ')', c_ltcyan, 100, 1000, 0, 0, itm_steel_plate, 3, + mfb(vpf_internal) | mfb(vpf_armor) }}, + {{ "superalloy plating",')', c_dkgray, ')', c_dkgray, 100, 900, 0, 0, itm_alloy_plate, 4, + mfb(vpf_internal) | mfb(vpf_armor) }}, + {{ "spiked plating", ')', c_red, ')', c_red, 150, 900, 0, 0, itm_spiked_plate, 3, + mfb(vpf_internal) | mfb(vpf_armor) | mfb(vpf_sharp) }}, + {{ "hard plating", ')', c_cyan, ')', c_cyan, 100, 2300, 0, 0, itm_hard_plate, 4, + mfb(vpf_internal) | mfb(vpf_armor) }}, + {{ "head light", '*', c_white, '*', c_white, 10, 20, 120, 0, itm_flashlight, 1, + mfb(vpf_internal) | mfb(vpf_light) }} }; diff --git a/vehicle.h b/vehicle.h index f6e3c38e63e39..168d84312eefb 100644 --- a/vehicle.h +++ b/vehicle.h @@ -49,7 +49,7 @@ struct veh_collision { struct vehicle_part { vehicle_part() : id(vp_null), mount_dx(0), mount_dy(0), hp(0), - blood(0), inside(false), flags(0), passenger_id(0), bigness(0) + blood(0), inside(false), flags(0), bigness(0), passenger_id(0) { precalc_dx[0] = precalc_dx[1] = -1; precalc_dy[0] = precalc_dy[1] = -1; From 22e1de332a0de4554c362825812b399343e62404 Mon Sep 17 00:00:00 2001 From: AkrionXxarr Date: Wed, 27 Feb 2013 11:09:02 -0800 Subject: [PATCH 2/6] Fixed a couple errors in previous commit. More warning resolutions. Reordered switch in artifact.cpp to match enum order. (Probably missed doing this to a couple previous switches, will have to go back) --- action.cpp | 4 +- artifact.cpp | 71 ++++++++++++--- item.h | 2 +- veh_type.h | 240 +++++++++++++++++++++++++-------------------------- vehicle.h | 2 +- 5 files changed, 185 insertions(+), 134 deletions(-) diff --git a/action.cpp b/action.cpp index 115e91c78fff1..2edb7132b1bc2 100644 --- a/action.cpp +++ b/action.cpp @@ -232,7 +232,7 @@ std::string action_ident(action_id act) case ACTION_NULL: return "null"; case NUM_ACTIONS: - // Unused. Added for completeness. + break; } return "unknown"; } @@ -392,7 +392,7 @@ std::string action_name(action_id act) case ACTION_NULL: return "No Action"; case NUM_ACTIONS: - // Unused. Added for completeness. + break; } return "Someone forgot to name an action."; } diff --git a/artifact.cpp b/artifact.cpp index c58f0a7d1309e..aa4468dbba93f 100644 --- a/artifact.cpp +++ b/artifact.cpp @@ -419,12 +419,14 @@ void game::process_artifact(item *it, player *p, bool wielded) it_artifact_tool* tool = dynamic_cast(it->type); effects = tool->effects_carried; if (wielded) { - for (int i = 0; i < tool->effects_wielded.size(); i++) + for (unsigned int i = 0; i < tool->effects_wielded.size(); i++) effects.push_back(tool->effects_wielded[i]); } // Recharge it if necessary if (it->charges < tool->max_charges) { switch (tool->charge_type) { + case ARTC_NULL: + break; case ARTC_TIME: if (turn.second == 0 && turn.minute == 0) // Once per hour it->charges++; @@ -448,12 +450,16 @@ void game::process_artifact(item *it, player *p, bool wielded) it->charges++; } break; + case NUM_ARTCS: + break; } } } - for (int i = 0; i < effects.size(); i++) { + for (unsigned int i = 0; i < effects.size(); i++) { switch (effects[i]) { + case AEP_NULL: + break; case AEP_STR_UP: p->str_cur += 4; break; @@ -480,17 +486,18 @@ void game::process_artifact(item *it, player *p, bool wielded) p->radiation--; break; - case AEP_SMOKE: - if (one_in(10)) { - int x = p->posx + rng(-1, 1), y = p->posy + rng(-1, 1); - if (m.add_field(this, x, y, fd_smoke, rng(1, 3))) - add_msg("The %s emits some smoke.", it->tname().c_str()); - } - break; - case AEP_SNAKES: break; // Handled in player::hit() + case AEP_INVISIBLE: + break; + + case AEP_CLAIRVOYANCE: + break; + + case AEP_STEALTH: + break; + case AEP_EXTINGUISH: for (int x = p->posx - 1; x <= p->posx + 1; x++) { for (int y = p->posy - 1; y <= p->posy + 1; y++) { @@ -504,6 +511,24 @@ void game::process_artifact(item *it, player *p, bool wielded) } break; + case AEP_GLOW: + break; + + case AEP_PSYSHIELD: + break; + + case AEP_RESIST_ELECTRICITY: + break; + + case AEP_CARRY_MORE: + break; + + case AEP_SAP_LIFE: + break; + + case AEP_SPLIT: + break; + case AEP_HUNGER: if (one_in(100)) p->hunger++; @@ -514,6 +539,14 @@ void game::process_artifact(item *it, player *p, bool wielded) p->thirst++; break; + case AEP_SMOKE: + if (one_in(10)) { + int x = p->posx + rng(-1, 1), y = p->posy + rng(-1, 1); + if (m.add_field(this, x, y, fd_smoke, rng(1, 3))) + add_msg("The %s emits some smoke.", it->tname().c_str()); + } + break; + case AEP_EVIL: if (one_in(150)) { // Once every 15 minutes, on average p->add_disease(DI_EVIL, 300, this); @@ -531,6 +564,12 @@ void game::process_artifact(item *it, player *p, bool wielded) p->radiation++; break; + case AEP_MUTAGENIC: + break; + + case AEP_ATTENTION: + break; + case AEP_STR_DOWN: p->str_cur -= 3; break; @@ -556,6 +595,18 @@ void game::process_artifact(item *it, player *p, bool wielded) case AEP_SPEED_DOWN: break; // Handled in player::current_speed() + + case AEP_FORCE_TELEPORT: + break; + + case AEP_MOVEMENT_NOISE: + break; + + case AEP_BAD_WEATHER: + break; + + case AEP_SICK: + break; } } } diff --git a/item.h b/item.h index 23125a3bfc9d2..12fcb856ff408 100644 --- a/item.h +++ b/item.h @@ -141,7 +141,7 @@ class item std::string name; char invlet; // Inventory letter - int charges; + unsigned int charges; bool active; // If true, it has active effects to be processed signed char damage; // How much damage it's sustained; generally, max is 5 char burnt; // How badly we're burnt diff --git a/veh_type.h b/veh_type.h index 6d126a48dc249..ee9474dfd5901 100644 --- a/veh_type.h +++ b/veh_type.h @@ -154,134 +154,134 @@ struct vpart_info // h, j, c to horizontal, vertical, cross correspondingly const vpart_info vpart_list[num_vparts] = { // name sym color sym_b color_b dmg dur par1 par2 item - {{ "null part", '?', c_red, '?', c_red, 100, 100, 0, 0, itm_null, 0, - 0 }}, - {{ "seat", '#', c_red, '*', c_red, 60, 300, 0, 0, itm_seat, 1, - mfb(vpf_over) | mfb(vpf_seat) | mfb(vpf_cargo) | mfb(vpf_no_reinforce) }}, - {{ "bed", '#', c_magenta, '*', c_magenta, 60, 300, 0, 0, itm_seat, 1, - mfb(vpf_over) | mfb(vpf_bed) | mfb(vpf_cargo) | mfb(vpf_no_reinforce) }}, - {{ "frame", 'h', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "frame", 'j', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "frame", 'c', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "frame", 'y', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "frame", 'u', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "frame", 'n', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "frame", 'b', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "frame", '=', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "frame", 'H', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "frame", '^', c_ltgray, '#', c_ltgray, 100, 400, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "handle", '^', c_ltcyan, '#', c_ltcyan, 100, 300, 0, 0, itm_frame, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }}, - {{ "board", 'h', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, - {{ "board", 'j', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, - {{ "board", 'y', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, - {{ "board", 'u', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, - {{ "board", 'n', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, - {{ "board", 'b', c_ltgray, '#', c_ltgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }}, - {{ "roof", '#', c_ltgray, '#', c_dkgray, 100, 1000, 0, 0, itm_steel_plate, 1, - mfb(vpf_internal) | mfb(vpf_roof) }}, - {{ "door", '+', c_cyan, '&', c_cyan, 80, 200, 0, 0, itm_frame, 2, - mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_openable) }}, - {{ "opaque door",'+', c_cyan, '&', c_cyan, 80, 200, 0, 0, itm_frame, 2, - mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_opaque) | mfb(vpf_openable) }}, - {{ "internal door", '+', c_cyan, '&', c_cyan, 75, 75, 0, 0, itm_frame, 2, - mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_opaque) | mfb(vpf_openable) | mfb(vpf_roof) | mfb(vpf_no_reinforce) }}, - {{ "windshield", '"', c_ltcyan, '0', c_ltgray, 70, 50, 0, 0, itm_glass_sheet, 1, - mfb(vpf_over) | mfb(vpf_obstacle) | mfb(vpf_no_reinforce) }}, - {{ "blade", '-', c_white, 'x', c_white, 250, 100, 0, 0, itm_carblade, 2, - mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }}, - {{ "blade", '|', c_white, 'x', c_white, 350, 100, 0, 0, itm_carblade, 2, - mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }}, - {{ "spike", '.', c_white, 'x', c_white, 300, 100, 0, 0, itm_carspike, 2, - mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }}, + { "null part", '?', c_red, '?', c_red, 100, 100, {0}, {0}, itm_null, 0, + 0 }, + { "seat", '#', c_red, '*', c_red, 60, 300, {0}, {0}, itm_seat, 1, + mfb(vpf_over) | mfb(vpf_seat) | mfb(vpf_cargo) | mfb(vpf_no_reinforce) }, + { "bed", '#', c_magenta, '*', c_magenta, 60, 300, {0}, {0}, itm_seat, 1, + mfb(vpf_over) | mfb(vpf_bed) | mfb(vpf_cargo) | mfb(vpf_no_reinforce) }, + { "frame", 'h', c_ltgray, '#', c_ltgray, 100, 400, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "frame", 'j', c_ltgray, '#', c_ltgray, 100, 400, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "frame", 'c', c_ltgray, '#', c_ltgray, 100, 400, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "frame", 'y', c_ltgray, '#', c_ltgray, 100, 400, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "frame", 'u', c_ltgray, '#', c_ltgray, 100, 400, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "frame", 'n', c_ltgray, '#', c_ltgray, 100, 400, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "frame", 'b', c_ltgray, '#', c_ltgray, 100, 400, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "frame", '=', c_ltgray, '#', c_ltgray, 100, 400, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "frame", 'H', c_ltgray, '#', c_ltgray, 100, 400, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "frame", '^', c_ltgray, '#', c_ltgray, 100, 400, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "handle", '^', c_ltcyan, '#', c_ltcyan, 100, 300, {0}, {0}, itm_frame, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) }, + { "board", 'h', c_ltgray, '#', c_ltgray, 100, 1000, {0}, {0}, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, + { "board", 'j', c_ltgray, '#', c_ltgray, 100, 1000, {0}, {0}, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, + { "board", 'y', c_ltgray, '#', c_ltgray, 100, 1000, {0}, {0}, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, + { "board", 'u', c_ltgray, '#', c_ltgray, 100, 1000, {0}, {0}, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, + { "board", 'n', c_ltgray, '#', c_ltgray, 100, 1000, {0}, {0}, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, + { "board", 'b', c_ltgray, '#', c_ltgray, 100, 1000, {0}, {0}, itm_steel_plate, 1, + mfb(vpf_external) | mfb(vpf_mount_point) | mfb (vpf_mount_inner) | mfb(vpf_opaque) | mfb(vpf_obstacle) }, + { "roof", '#', c_ltgray, '#', c_dkgray, 100, 1000, {0}, {0}, itm_steel_plate, 1, + mfb(vpf_internal) | mfb(vpf_roof) }, + { "door", '+', c_cyan, '&', c_cyan, 80, 200, {0}, {0}, itm_frame, 2, + mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_openable) }, + { "opaque door",'+', c_cyan, '&', c_cyan, 80, 200, {0}, {0}, itm_frame, 2, + mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_opaque) | mfb(vpf_openable) }, + { "internal door", '+', c_cyan, '&', c_cyan, 75, 75, {0}, {0}, itm_frame, 2, + mfb(vpf_external) | mfb(vpf_obstacle) | mfb(vpf_opaque) | mfb(vpf_openable) | mfb(vpf_roof) | mfb(vpf_no_reinforce) }, + { "windshield", '"', c_ltcyan, '0', c_ltgray, 70, 50, {0}, {0}, itm_glass_sheet, 1, + mfb(vpf_over) | mfb(vpf_obstacle) | mfb(vpf_no_reinforce) }, + { "blade", '-', c_white, 'x', c_white, 250, 100, {0}, {0}, itm_carblade, 2, + mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }, + { "blade", '|', c_white, 'x', c_white, 350, 100, {0}, {0}, itm_carblade, 2, + mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }, + { "spike", '.', c_white, 'x', c_white, 300, 100, {0}, {0}, itm_carspike, 2, + mfb(vpf_external) | mfb(vpf_unmount_on_damage) | mfb(vpf_sharp) | mfb(vpf_no_reinforce) }, // wheel_width(inches) - {{ "wheel", '0', c_dkgray, 'x', c_ltgray, 50, 200, 9, 0, itm_wheel, 4, - mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }}, - {{ "wide wheel", 'O', c_dkgray, 'x', c_ltgray, 50, 400, 14, 0, itm_wheel_wide, 5, - mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }}, - {{ "bicycle wheel",'|', c_dkgray, 'x', c_ltgray, 50, 40, 2, 0, itm_wheel_bicycle, 1, - mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }}, - {{ "motorbike wheel",'o',c_dkgray, 'x', c_ltgray, 50, 90, 4, 0, itm_wheel_motorbike, 2, - mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }}, - {{ "small wheel", 'o',c_dkgray, 'x', c_ltgray, 50, 70, 6, 0, itm_wheel_small, 2, - mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }}, + { "wheel", '0', c_dkgray, 'x', c_ltgray, 50, 200, {9}, {0}, itm_wheel, 4, + mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }, + { "wide wheel", 'O', c_dkgray, 'x', c_ltgray, 50, 400, {14}, {0}, itm_wheel_wide, 5, + mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }, + { "bicycle wheel",'|', c_dkgray, 'x', c_ltgray, 50, 40, {2}, {0}, itm_wheel_bicycle, 1, + mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }, + { "motorbike wheel",'o',c_dkgray, 'x', c_ltgray, 50, 90, {4}, {0}, itm_wheel_motorbike, 2, + mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }, + { "small wheel", 'o',c_dkgray, 'x', c_ltgray, 50, 70, {6}, {0}, itm_wheel_small, 2, + mfb(vpf_external) | mfb (vpf_mount_over) | mfb(vpf_wheel) | mfb(vpf_mount_point) | mfb(vpf_variable_size) }, // - {{ "1-cylinder engine", '*', c_ltred, '#', c_red, 80, 150, 40, AT_GAS, itm_1cyl_combustion, 2, - mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }}, - {{ "V-twin engine", '*', c_ltred, '#', c_red, 80, 200, 120, AT_GAS, itm_v2_combustion, 2, - mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }}, - {{ "Inline-4 engine", '*', c_ltred, '#', c_red, 80, 300, 300, AT_GAS, itm_i4_combustion, 3, - mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }}, - {{ "V6 engine", '*', c_ltred, '#', c_red, 80, 400, 800, AT_GAS, itm_v6_combustion, 4, - mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }}, - {{ "V8 engine", '*', c_ltred, '#', c_red, 80, 400, 800, AT_GAS, itm_v8_combustion, 4, - mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }}, - {{ "electric motor", '*', c_yellow, '#', c_red, 80, 200, 70, AT_BATT, itm_motor, 3, - mfb(vpf_internal) | mfb(vpf_engine) }}, - {{ "large electric motor", '*', c_yellow, '#', c_red, 80, 400, 350, AT_BATT, itm_motor_large, 4, - mfb(vpf_internal) | mfb(vpf_engine) }}, - {{ "plasma engine", '*', c_ltblue, '#', c_red, 80, 250, 400, AT_PLASMA, itm_plasma_engine, 6, - mfb(vpf_internal) | mfb(vpf_engine) }}, - {{ "Foot pedals", '*', c_ltgray, '#', c_red, 50, 50, 70, AT_MUSCLE, itm_foot_crank, 1, - mfb(vpf_internal) | mfb(vpf_engine) }}, + { "1-cylinder engine", '*', c_ltred, '#', c_red, 80, 150, {40}, {AT_GAS}, itm_1cyl_combustion, 2, + mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }, + { "V-twin engine", '*', c_ltred, '#', c_red, 80, 200, {120}, {AT_GAS}, itm_v2_combustion, 2, + mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }, + { "Inline-4 engine", '*', c_ltred, '#', c_red, 80, 300, {300}, {AT_GAS}, itm_i4_combustion, 3, + mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }, + { "V6 engine", '*', c_ltred, '#', c_red, 80, 400, {800}, {AT_GAS}, itm_v6_combustion, 4, + mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }, + { "V8 engine", '*', c_ltred, '#', c_red, 80, 400, {800}, {AT_GAS}, itm_v8_combustion, 4, + mfb(vpf_internal) | mfb(vpf_engine) | mfb(vpf_variable_size) }, + { "electric motor", '*', c_yellow, '#', c_red, 80, 200, {70}, {AT_BATT}, itm_motor, 3, + mfb(vpf_internal) | mfb(vpf_engine) }, + { "large electric motor", '*', c_yellow, '#', c_red, 80, 400, {350}, {AT_BATT}, itm_motor_large, 4, + mfb(vpf_internal) | mfb(vpf_engine) }, + { "plasma engine", '*', c_ltblue, '#', c_red, 80, 250, {400}, {AT_PLASMA}, itm_plasma_engine, 6, + mfb(vpf_internal) | mfb(vpf_engine) }, + { "Foot pedals", '*', c_ltgray, '#', c_red, 50, 50, {70}, {AT_MUSCLE}, itm_foot_crank, 1, + mfb(vpf_internal) | mfb(vpf_engine) }, // capacity type - {{ "gasoline tank", 'O', c_ltred, '#', c_red, 80, 150, 3000, AT_GAS, itm_metal_tank, 1, - mfb(vpf_internal) | mfb(vpf_fuel_tank) }}, - {{ "storage battery", 'O', c_yellow, '#', c_red, 80, 300, 1000, AT_BATT, itm_storage_battery, 2, - mfb(vpf_internal) | mfb(vpf_fuel_tank) }}, - {{ "minireactor", 'O', c_ltgreen, '#', c_red, 80, 700, 10000, AT_PLUT, itm_minireactor, 7, - mfb(vpf_internal) | mfb(vpf_fuel_tank) }}, - {{ "hydrogene tank", 'O', c_ltblue, '#', c_red, 80, 150, 3000, AT_PLASMA, itm_metal_tank, 1, - mfb(vpf_internal) | mfb(vpf_fuel_tank) }}, - {{ "trunk", 'H', c_brown, '#', c_brown, 80, 300, 400, 0, itm_frame, 1, - mfb(vpf_over) | mfb(vpf_cargo) }}, - {{ "box", 'o', c_brown, '#', c_brown, 60, 100, 400, 0, itm_frame, 1, - mfb(vpf_over) | mfb(vpf_cargo) }}, + { "gasoline tank", 'O', c_ltred, '#', c_red, 80, 150, {3000}, {AT_GAS}, itm_metal_tank, 1, + mfb(vpf_internal) | mfb(vpf_fuel_tank) }, + { "storage battery", 'O', c_yellow, '#', c_red, 80, 300, {1000}, {AT_BATT}, itm_storage_battery, 2, + mfb(vpf_internal) | mfb(vpf_fuel_tank) }, + { "minireactor", 'O', c_ltgreen, '#', c_red, 80, 700, {10000}, {AT_PLUT}, itm_minireactor, 7, + mfb(vpf_internal) | mfb(vpf_fuel_tank) }, + { "hydrogene tank", 'O', c_ltblue, '#', c_red, 80, 150, {3000}, {AT_PLASMA}, itm_metal_tank, 1, + mfb(vpf_internal) | mfb(vpf_fuel_tank) }, + { "trunk", 'H', c_brown, '#', c_brown, 80, 300, {400}, {0}, itm_frame, 1, + mfb(vpf_over) | mfb(vpf_cargo) }, + { "box", 'o', c_brown, '#', c_brown, 60, 100, {400}, {0}, itm_frame, 1, + mfb(vpf_over) | mfb(vpf_cargo) }, - {{ "controls", '$', c_ltgray, '$', c_red, 10, 250, 0, 0, itm_vehicle_controls, 3, - mfb(vpf_internal) | mfb(vpf_controls) }}, + { "controls", '$', c_ltgray, '$', c_red, 10, 250, {0}, {0}, itm_vehicle_controls, 3, + mfb(vpf_internal) | mfb(vpf_controls) }, // bonus - {{ "muffler", '/', c_ltgray, '/', c_ltgray, 10, 150, 40, 0, itm_muffler, 2, - mfb(vpf_internal) | mfb(vpf_muffler) }}, - {{ "seatbelt", ',', c_ltgray, ',', c_red, 10, 200, 25, 0, itm_rope_6, 1, - mfb(vpf_internal) | mfb(vpf_seatbelt) }}, - {{ "solar panel", '#', c_yellow, 'x', c_yellow, 10, 20, 30, 0, itm_solar_panel, 6, - mfb(vpf_over) | mfb(vpf_solar_panel) }}, + { "muffler", '/', c_ltgray, '/', c_ltgray, 10, 150, {40}, {0}, itm_muffler, 2, + mfb(vpf_internal) | mfb(vpf_muffler) }, + { "seatbelt", ',', c_ltgray, ',', c_red, 10, 200, {25}, {0}, itm_rope_6, 1, + mfb(vpf_internal) | mfb(vpf_seatbelt) }, + { "solar panel", '#', c_yellow, 'x', c_yellow, 10, 20, {30}, {0}, itm_solar_panel, 6, + mfb(vpf_over) | mfb(vpf_solar_panel) }, - {{ "mounted M249", 't', c_cyan, '#', c_cyan, 80, 400, 0, AT_223, itm_m249, 6, - mfb(vpf_over) | mfb(vpf_turret) | mfb(vpf_cargo) }}, - {{ "mounted flamethrower", 't', c_dkgray, '#', c_dkgray, 80, 400, 0, AT_GAS, itm_flamethrower, 7, - mfb(vpf_over) | mfb(vpf_turret) }}, - {{ "mounted plasma gun", 't', c_ltblue, '#', c_ltblue, 80, 400, 0, AT_PLASMA, itm_plasma_rifle, 7, - mfb(vpf_over) | mfb(vpf_turret) }}, + { "mounted M249", 't', c_cyan, '#', c_cyan, 80, 400, {0}, {AT_223}, itm_m249, 6, + mfb(vpf_over) | mfb(vpf_turret) | mfb(vpf_cargo) }, + { "mounted flamethrower", 't', c_dkgray, '#', c_dkgray, 80, 400, {0}, {AT_GAS}, itm_flamethrower, 7, + mfb(vpf_over) | mfb(vpf_turret) }, + { "mounted plasma gun", 't', c_ltblue, '#', c_ltblue, 80, 400, {0}, {AT_PLASMA}, itm_plasma_rifle, 7, + mfb(vpf_over) | mfb(vpf_turret) }, - {{ "steel plating", ')', c_ltcyan, ')', c_ltcyan, 100, 1000, 0, 0, itm_steel_plate, 3, - mfb(vpf_internal) | mfb(vpf_armor) }}, - {{ "superalloy plating",')', c_dkgray, ')', c_dkgray, 100, 900, 0, 0, itm_alloy_plate, 4, - mfb(vpf_internal) | mfb(vpf_armor) }}, - {{ "spiked plating", ')', c_red, ')', c_red, 150, 900, 0, 0, itm_spiked_plate, 3, - mfb(vpf_internal) | mfb(vpf_armor) | mfb(vpf_sharp) }}, - {{ "hard plating", ')', c_cyan, ')', c_cyan, 100, 2300, 0, 0, itm_hard_plate, 4, - mfb(vpf_internal) | mfb(vpf_armor) }}, - {{ "head light", '*', c_white, '*', c_white, 10, 20, 120, 0, itm_flashlight, 1, - mfb(vpf_internal) | mfb(vpf_light) }} + { "steel plating", ')', c_ltcyan, ')', c_ltcyan, 100, 1000, {0}, {0}, itm_steel_plate, 3, + mfb(vpf_internal) | mfb(vpf_armor) }, + { "superalloy plating",')', c_dkgray, ')', c_dkgray, 100, 900, {0}, {0}, itm_alloy_plate, 4, + mfb(vpf_internal) | mfb(vpf_armor) }, + { "spiked plating", ')', c_red, ')', c_red, 150, 900, {0}, {0}, itm_spiked_plate, 3, + mfb(vpf_internal) | mfb(vpf_armor) | mfb(vpf_sharp) }, + { "hard plating", ')', c_cyan, ')', c_cyan, 100, 2300, {0}, {0}, itm_hard_plate, 4, + mfb(vpf_internal) | mfb(vpf_armor) }, + { "head light", '*', c_white, '*', c_white, 10, 20, {120}, {0}, itm_flashlight, 1, + mfb(vpf_internal) | mfb(vpf_light) } }; diff --git a/vehicle.h b/vehicle.h index 168d84312eefb..fdfb8b6ec2143 100644 --- a/vehicle.h +++ b/vehicle.h @@ -49,7 +49,7 @@ struct veh_collision { struct vehicle_part { vehicle_part() : id(vp_null), mount_dx(0), mount_dy(0), hp(0), - blood(0), inside(false), flags(0), bigness(0), passenger_id(0) + blood(0), bigness(0), inside(false), flags(0), passenger_id(0) { precalc_dx[0] = precalc_dx[1] = -1; precalc_dy[0] = precalc_dy[1] = -1; From d3c6015ea6f47b4c09aa4470ad4f8c65dff50e35 Mon Sep 17 00:00:00 2001 From: AkrionXxarr Date: Wed, 27 Feb 2013 12:17:43 -0800 Subject: [PATCH 3/6] Further warning resolutions. Further warning resolutions. Tweeked previous -Wunused-parameter warning fixes Further warning resolutions. Further warning resolutions. Crazy source file is crazy. Potential bug fix? --- action.cpp | 10 +++--- artifact.cpp | 76 +++++++---------------------------------- bionics.cpp | 15 +++++---- catacurse.cpp | 19 ++++++----- computer.cpp | 25 ++++++++------ construction.cpp | 48 ++++++++++++++------------ crafting.cpp | 43 ++++++++++++----------- defense.cpp | 37 +++++++++++++------- disease.cpp | 13 ++++--- event.cpp | 2 +- faction.cpp | 2 +- field.cpp | 33 ++++++++++++------ game.cpp | 88 ++++++++++++++++++++++++++++-------------------- gamemode.h | 12 +++---- itype.h | 2 +- iuse.h | 2 +- mission.h | 4 +-- monattack.h | 2 +- omdata.h | 4 +-- settlement.h | 2 +- trap.h | 14 ++++---- 21 files changed, 231 insertions(+), 222 deletions(-) diff --git a/action.cpp b/action.cpp index 2edb7132b1bc2..9c80de60b49f9 100644 --- a/action.cpp +++ b/action.cpp @@ -231,8 +231,9 @@ std::string action_ident(action_id act) return "debug_mode"; case ACTION_NULL: return "null"; - case NUM_ACTIONS: - break; + + default: + break; } return "unknown"; } @@ -391,8 +392,9 @@ std::string action_name(action_id act) return "Toggle Debug Messages"; case ACTION_NULL: return "No Action"; - case NUM_ACTIONS: - break; + + default: + break; } return "Someone forgot to name an action."; } diff --git a/artifact.cpp b/artifact.cpp index aa4468dbba93f..34881b5133351 100644 --- a/artifact.cpp +++ b/artifact.cpp @@ -425,8 +425,6 @@ void game::process_artifact(item *it, player *p, bool wielded) // Recharge it if necessary if (it->charges < tool->max_charges) { switch (tool->charge_type) { - case ARTC_NULL: - break; case ARTC_TIME: if (turn.second == 0 && turn.minute == 0) // Once per hour it->charges++; @@ -450,6 +448,9 @@ void game::process_artifact(item *it, player *p, bool wielded) it->charges++; } break; + + // Unused enums added for completeness. + case ARTC_NULL: case NUM_ARTCS: break; } @@ -458,8 +459,6 @@ void game::process_artifact(item *it, player *p, bool wielded) for (unsigned int i = 0; i < effects.size(); i++) { switch (effects[i]) { - case AEP_NULL: - break; case AEP_STR_UP: p->str_cur += 4; break; @@ -478,26 +477,12 @@ void game::process_artifact(item *it, player *p, bool wielded) p->per_cur += 2; p->int_cur += 2; break; - case AEP_SPEED_UP: // Handled in player::current_speed() - break; case AEP_IODINE: if (p->radiation > 0) p->radiation--; break; - case AEP_SNAKES: - break; // Handled in player::hit() - - case AEP_INVISIBLE: - break; - - case AEP_CLAIRVOYANCE: - break; - - case AEP_STEALTH: - break; - case AEP_EXTINGUISH: for (int x = p->posx - 1; x <= p->posx + 1; x++) { for (int y = p->posy - 1; y <= p->posy + 1; y++) { @@ -511,24 +496,6 @@ void game::process_artifact(item *it, player *p, bool wielded) } break; - case AEP_GLOW: - break; - - case AEP_PSYSHIELD: - break; - - case AEP_RESIST_ELECTRICITY: - break; - - case AEP_CARRY_MORE: - break; - - case AEP_SAP_LIFE: - break; - - case AEP_SPLIT: - break; - case AEP_HUNGER: if (one_in(100)) p->hunger++; @@ -556,20 +523,6 @@ void game::process_artifact(item *it, player *p, bool wielded) } break; - case AEP_SCHIZO: - break; // Handled in player::suffer() - - case AEP_RADIOACTIVE: - if (one_in(4)) - p->radiation++; - break; - - case AEP_MUTAGENIC: - break; - - case AEP_ATTENTION: - break; - case AEP_STR_DOWN: p->str_cur -= 3; break; @@ -593,19 +546,13 @@ void game::process_artifact(item *it, player *p, bool wielded) p->int_cur -= 2; break; - case AEP_SPEED_DOWN: - break; // Handled in player::current_speed() - - case AEP_FORCE_TELEPORT: - break; - - case AEP_MOVEMENT_NOISE: + case AEP_RADIOACTIVE: + if (one_in(4)) + p->radiation++; break; - case AEP_BAD_WEATHER: - break; - case AEP_SICK: + default: break; } } @@ -614,7 +561,7 @@ void game::process_artifact(item *it, player *p, bool wielded) void game::add_artifact_messages(std::vector effects) { int net_str = 0, net_dex = 0, net_per = 0, net_int = 0, net_speed = 0; - for (int i = 0; i < effects.size(); i++) { + for (unsigned int i = 0; i < effects.size(); i++) { switch (effects[i]) { case AEP_STR_UP: net_str += 4; break; case AEP_DEX_UP: net_dex += 4; break; @@ -636,9 +583,6 @@ void game::add_artifact_messages(std::vector effects) case AEP_SPEED_UP: net_speed += 20; break; case AEP_SPEED_DOWN: net_speed -= 20; break; - case AEP_IODINE: - break; // No message - case AEP_SNAKES: add_msg("Your skin feels slithery."); break; @@ -710,6 +654,10 @@ void game::add_artifact_messages(std::vector effects) case AEP_BAD_WEATHER: add_msg("You feel storms coming."); break; + + // Unused enums added for completeness. + default: + break; } } diff --git a/bionics.cpp b/bionics.cpp index e88652b4f3d83..50bd67fd7963b 100644 --- a/bionics.cpp +++ b/bionics.cpp @@ -48,11 +48,11 @@ void player::activate_bionic(int b, game *g) std::vector good; std::vector bad; WINDOW* w; - int dirx, diry, t, l, index; + int dirx, diry, t, index; + unsigned int l; item tmp_item; switch (bio.id) { - case bio_painkiller: pkill += 6; pain -= 2; @@ -134,7 +134,7 @@ void player::activate_bionic(int b, game *g) if (good.size() == 0 && bad.size() == 0) mvwprintz(w, 1, 1, c_white, "No effects."); else { - for (int line = 1; line < 39 && line <= good.size() + bad.size(); line++) { + for (unsigned int line = 1; line < 39 && line <= good.size() + bad.size(); line++) { if (line <= bad.size()) mvwprintz(w, line, 1, c_red, bad[line - 1].c_str()); else @@ -268,7 +268,7 @@ void player::activate_bionic(int b, game *g) break; case bio_water_extractor: - for (int i = 0; i < g->m.i_at(posx, posy).size(); i++) { + for (unsigned int i = 0; i < g->m.i_at(posx, posy).size(); i++) { item tmp = g->m.i_at(posx, posy)[i]; if (tmp.type->id == itm_corpse && query_yn("Extract water from the %s", tmp.tname().c_str())) { @@ -306,7 +306,7 @@ void player::activate_bionic(int b, game *g) traj = line_to(i, j, posx, posy, 0); } traj.insert(traj.begin(), point(i, j)); - for (int k = 0; k < g->m.i_at(i, j).size(); k++) { + for (unsigned int k = 0; k < g->m.i_at(i, j).size(); k++) { if (g->m.i_at(i, j)[k].made_of(IRON) || g->m.i_at(i, j)[k].made_of(STEEL)){ tmp_item = g->m.i_at(i, j)[k]; g->m.i_rem(i, j, k); @@ -353,6 +353,9 @@ void player::activate_bionic(int b, game *g) g->add_msg("You can't unlock that %s.", g->m.tername(dirx, diry).c_str()); break; + // Unused enums added for completeness. + default: + break; } } @@ -383,7 +386,7 @@ bool player::install_bionics(game *g, it_bionic* type) mvwputch(w, 21, i, c_ltgray, LINE_OXOX); } // Init the list of bionics - for (int i = 1; i < type->options.size(); i++) { + for (unsigned int i = 1; i < type->options.size(); i++) { bionic_id id = type->options[i]; mvwprintz(w, i + 2, 0, (has_bionic(id) ? c_ltred : c_ltblue), bionics[id].name.c_str()); diff --git a/catacurse.cpp b/catacurse.cpp index 5ed61406bf6e3..deb78c0fcf4c2 100644 --- a/catacurse.cpp +++ b/catacurse.cpp @@ -262,12 +262,12 @@ WINDOW *initscr(void) lastchar=-1; inputdelay=-1; std::string typeface; -char * typeface_c; +char * typeface_c = NULL; std::ifstream fin; fin.open("data\\FONTDATA"); if (!fin.is_open()){ MessageBox(WindowHandle, "Failed to open FONTDATA, loading defaults.", - NULL, NULL); + NULL, 0); fontheight=16; fontwidth=8; } else { @@ -278,7 +278,7 @@ fin.open("data\\FONTDATA"); fin >> fontheight; if ((fontwidth <= 4) || (fontheight <=4)){ MessageBox(WindowHandle, "Invalid font size specified!", - NULL, NULL); + NULL, 0); fontheight=16; fontwidth=8; } @@ -314,7 +314,7 @@ fin.open("data\\FONTDATA"); } else { MessageBox(WindowHandle, "Failed to load default font, using FixedSys.", - NULL, NULL); + NULL, 0); font = CreateFont(fontheight, fontwidth, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS, PROOF_QUALITY, FF_MODERN, "FixedSys"); //Create our font @@ -324,7 +324,8 @@ fin.open("data\\FONTDATA"); SelectObject(backbuffer, font);//Load our font into the DC // WindowCount=0; - delete typeface_c; + if (typeface_c != NULL) delete typeface_c; + mainwin = newwin((OPTIONS[OPT_VIEWPORT_Y] * 2 + 1),(55 + (OPTIONS[OPT_VIEWPORT_Y] * 2 + 1)),0,0); return mainwin; //create the 'stdscr' window and return its ref }; @@ -679,7 +680,7 @@ int start_color(void) return SetDIBColorTable(backbuffer, 0, 16, windowsPalette); }; -int keypad(WINDOW *faux, bool bf) +int keypad(WINDOW */*faux*/, bool /*bf*/) { return 1; }; @@ -692,11 +693,11 @@ int cbreak(void) { return 1; }; -int keypad(int faux, bool bf) +int keypad(int /*faux*/, bool /*bf*/) { return 1; }; -int curs_set(int visibility) +int curs_set(int /*visibility*/) { return 1; }; @@ -717,7 +718,7 @@ int wattron(WINDOW *win, int attrs) if (isBlink) win->BG += 8; return 1; }; -int wattroff(WINDOW *win, int attrs) +int wattroff(WINDOW *win, int /*attrs*/) { win->FG=8; //reset to white win->BG=0; //reset to black diff --git a/computer.cpp b/computer.cpp index 8d42d2a2cf69e..ae25d81f1ba47 100644 --- a/computer.cpp +++ b/computer.cpp @@ -35,10 +35,10 @@ computer& computer::operator=(const computer &rhs) name = rhs.name; mission_id = rhs.mission_id; options.clear(); - for (int i = 0; i < rhs.options.size(); i++) + for (unsigned int i = 0; i < rhs.options.size(); i++) options.push_back(rhs.options[i]); failures.clear(); - for (int i = 0; i < rhs.failures.size(); i++) + for (unsigned int i = 0; i < rhs.failures.size(); i++) failures.push_back(rhs.failures[i]); w_terminal = NULL; return *this; @@ -123,7 +123,7 @@ void computer::use(game *g) //reset_terminal(); print_line(""); print_line("%s - Root Menu", name.c_str()); - for (int i = 0; i < options.size(); i++) + for (unsigned int i = 0; i < options.size(); i++) print_line("%d - %s", i + 1, options[i].name.c_str()); print_line("Q - Quit and shut down"); print_line(""); @@ -131,7 +131,7 @@ void computer::use(game *g) char ch; do ch = getch(); - while (ch != 'q' && ch != 'Q' && (ch < '1' || ch - '1' >= options.size())); + while (ch != 'q' && ch != 'Q' && (ch < '1' || unsigned(ch - '1') >= options.size())); if (ch == 'q' || ch == 'Q') done = true; else { // We selected an option other than quit. @@ -183,7 +183,7 @@ std::string computer::save_data() } data << savename << " " << security << " " << mission_id << " " << options.size() << " "; - for (int i = 0; i < options.size(); i++) { + for (unsigned int i = 0; i < options.size(); i++) { savename = options[i].name; found = savename.find(" "); while (found != std::string::npos) { @@ -194,7 +194,7 @@ std::string computer::save_data() options[i].security << " "; } data << failures.size() << " "; - for (int i = 0; i < failures.size(); i++) + for (unsigned int i = 0; i < failures.size(); i++) data << int(failures[i]) << " "; return data.str(); @@ -257,7 +257,7 @@ void computer::activate_function(game *g, computer_action action) for (int y1 = y - 1; y1 <= y + 1; y1++ ) { if (g->m.ter(x1, y1) == t_counter) { bool found_item = false; - for (int i = 0; i < g->m.i_at(x1, y1).size(); i++) { + for (unsigned int i = 0; i < g->m.i_at(x1, y1).size(); i++) { item *it = &(g->m.i_at(x1, y1)[i]); if (it->is_container() && it->contents.empty()) { it->put_in( item(g->itypes[itm_sewage], g->turn) ); @@ -460,7 +460,7 @@ void computer::activate_function(game *g, computer_action action) int more = 0; for (int x = 0; x < SEEX * MAPSIZE; x++) { for (int y = 0; y < SEEY * MAPSIZE; y++) { - for (int i = 0; i < g->m.i_at(x, y).size(); i++) { + for (unsigned int i = 0; i < g->m.i_at(x, y).size(); i++) { if (g->m.i_at(x, y)[i].is_bionic()) { if (names.size() < 9) names.push_back(g->m.i_at(x, y)[i].tname()); @@ -470,7 +470,7 @@ void computer::activate_function(game *g, computer_action action) } } } - for (int i = 0; i < names.size(); i++) + for (unsigned int i = 0; i < names.size(); i++) print_line(names[i].c_str()); if (more > 0) print_line("%d OTHERS FOUND..."); @@ -637,6 +637,8 @@ INITIATING STANDARD TREMOR TEST..."); } break; + default: + break; } // switch (action) } @@ -764,7 +766,7 @@ void computer::activate_failure(game *g, computer_failure fail) for (int x = g->u.posx - 2; x <= g->u.posx + 2; x++) { for (int y = g->u.posy - 2; y <= g->u.posy + 2; y++) { if (g->m.ter(x, y) == t_centrifuge) { - for (int i = 0; i < g->m.i_at(x, y).size(); i++) { + for (unsigned int i = 0; i < g->m.i_at(x, y).size(); i++) { if (g->m.i_at(x, y).empty()) print_error("ERROR: Please place sample in centrifuge."); else if (g->m.i_at(x, y).size() > 1) @@ -785,6 +787,9 @@ void computer::activate_failure(game *g, computer_failure fail) } getch(); break; + + default: + break; }// switch (fail) } diff --git a/construction.cpp b/construction.cpp index fa14da0cda7aa..f86865151c413 100644 --- a/construction.cpp +++ b/construction.cpp @@ -308,7 +308,7 @@ void game::construction_menu() // Print stages and their requirements int posx = 33, posy = 2; - for (int n = 0; n < current_con->stages.size(); n++) { + for (unsigned int n = 0; n < current_con->stages.size(); n++) { nc_color color_stage = (player_can_build(u, total_inv, current_con, n, false, true) ? c_white : c_dkgray); @@ -323,7 +323,7 @@ void game::construction_menu() for (int i = 0; i < 3 && !has_tool[i]; i++) { posy++; posx = 33; - for (int j = 0; j < stage.tools[i].size(); j++) { + for (unsigned int j = 0; j < stage.tools[i].size(); j++) { itype_id tool = stage.tools[i][j]; nc_color col = c_red; if (total_inv.has_amount(tool, 1)) { @@ -357,7 +357,7 @@ void game::construction_menu() posx = 33; while (has_component[i]) i++; - for (int j = 0; j < stage.components[i].size() && i < 3; j++) { + for (unsigned int j = 0; j < stage.components[i].size() && i < 3; j++) { nc_color col = c_red; component comp = stage.components[i][j]; if (( itypes[comp.type]->is_ammo() && @@ -431,7 +431,7 @@ void game::construction_menu() case KEY_ESCAPE: break; default: - if (ch < 97 || ch > constructions.size() + 101) break; + if (ch < 96 || unsigned(ch) > constructions.size() + 101) break; // Map menu items to hotkey letters, skipping j, k, l, and q. char hotkey = ch - ((ch < 106) ? 97 : ((ch < 112) ? 100 : 101)); if (player_can_build(u, total_inv, constructions[hotkey])) { @@ -467,7 +467,7 @@ bool game::player_can_build(player &p, inventory inv, constructable* con, start = level; bool can_build_any = false; - for (int i = start; i < con->stages.size() && i <= last_level; i++) { + for (unsigned int i = start; i < con->stages.size() && i <= last_level; i++) { construction_stage stage = con->stages[i]; bool has_tool = false; bool has_component = false; @@ -478,7 +478,7 @@ bool game::player_can_build(player &p, inventory inv, constructable* con, if (stage.tools[j].size() > 0) { tools_required = true; has_tool = false; - for (int k = 0; k < stage.tools[j].size() && !has_tool; k++) { + for (unsigned int k = 0; k < stage.tools[j].size() && !has_tool; k++) { if (inv.has_amount(stage.tools[j][k], 1)) has_tool = true; } @@ -488,7 +488,7 @@ bool game::player_can_build(player &p, inventory inv, constructable* con, if (stage.components[j].size() > 0) { components_required = true; has_component = false; - for (int k = 0; k < stage.components[j].size() && !has_component; k++) { + for (unsigned int k = 0; k < stage.components[j].size() && !has_component; k++) { if (( itypes[stage.components[j][k].type]->is_ammo() && inv.has_charges(stage.components[j][k].type, stage.components[j][k].count) ) || @@ -524,7 +524,7 @@ void game::place_construction(constructable *con) y++; construct test; bool place_okay = (test.*(con->able))(this, point(x, y)); - for (int i = 0; i < con->stages.size() && !place_okay; i++) { + for (unsigned int i = 0; i < con->stages.size() && !place_okay; i++) { if (m.ter(x, y) == con->stages[i].terrain) place_okay = true; } @@ -532,11 +532,11 @@ void game::place_construction(constructable *con) if (place_okay) { // Make sure we're not trying to continue a construction that we can't finish int starting_stage = 0, max_stage = -1; - for (int i = 0; i < con->stages.size(); i++) { + for (unsigned int i = 0; i < con->stages.size(); i++) { if (m.ter(x, y) == con->stages[i].terrain) starting_stage = i + 1; } - for(int i = starting_stage; i < con->stages.size(); i++) { + for(unsigned int i = starting_stage; i < con->stages.size(); i++) { if (player_can_build(u, total_inv, con, i, true, true)) max_stage = i; else @@ -560,7 +560,7 @@ void game::place_construction(constructable *con) dirx += u.posx; diry += u.posy; bool point_is_okay = false; - for (int i = 0; i < valid.size() && !point_is_okay; i++) { + for (unsigned int i = 0; i < valid.size() && !point_is_okay; i++) { if (valid[i].x == dirx && valid[i].y == diry) point_is_okay = true; } @@ -571,7 +571,7 @@ void game::place_construction(constructable *con) // Figure out what stage to start at, and what stage is the maximum int starting_stage = 0, max_stage = 0; - for (int i = 0; i < con->stages.size(); i++) { + for (unsigned int i = 0; i < con->stages.size(); i++) { if (m.ter(dirx, diry) == con->stages[i].terrain) starting_stage = i + 1; if (player_can_build(u, total_inv, con, i, true)) @@ -737,12 +737,12 @@ bool construct::able_pit(game *g, point p) bool construct::able_between_walls(game *g, point p) { - return (g->m.has_flag(supports_roof, p.x -1, p.y) && g->m.has_flag(supports_roof, p.x +1, p.y) || - g->m.has_flag(supports_roof, p.x -1, p.y) && g->m.has_flag(supports_roof, p.x, p.y +1) || - g->m.has_flag(supports_roof, p.x -1, p.y) && g->m.has_flag(supports_roof, p.x, p.y -1) || - g->m.has_flag(supports_roof, p.x +1, p.y) && g->m.has_flag(supports_roof, p.x, p.y +1) || - g->m.has_flag(supports_roof, p.x +1, p.y) && g->m.has_flag(supports_roof, p.x, p.y -1) || - g->m.has_flag(supports_roof, p.x, p.y -1) && g->m.has_flag(supports_roof, p.x, p.y +1)); + return ((g->m.has_flag(supports_roof, p.x -1, p.y) && g->m.has_flag(supports_roof, p.x +1, p.y)) || + (g->m.has_flag(supports_roof, p.x -1, p.y) && g->m.has_flag(supports_roof, p.x, p.y +1)) || + (g->m.has_flag(supports_roof, p.x -1, p.y) && g->m.has_flag(supports_roof, p.x, p.y -1)) || + (g->m.has_flag(supports_roof, p.x +1, p.y) && g->m.has_flag(supports_roof, p.x, p.y +1)) || + (g->m.has_flag(supports_roof, p.x +1, p.y) && g->m.has_flag(supports_roof, p.x, p.y -1)) || + (g->m.has_flag(supports_roof, p.x, p.y -1) && g->m.has_flag(supports_roof, p.x, p.y +1))); } bool construct::able_deconstruct(game *g, point p) @@ -750,7 +750,7 @@ bool construct::able_deconstruct(game *g, point p) return (g->m.has_flag(deconstruct, p.x, p.y)); } -void construct::done_window_pane(game *g, point p) +void construct::done_window_pane(game *g, point /*p*/) { g->m.add_item(g->u.posx, g->u.posy, g->itypes[itm_glass_sheet], 0); } @@ -780,7 +780,7 @@ void construct::done_furniture(game *g, point p) //Move all Items within a container std::vector vItemMove = g->m.i_at(p.x, p.y); - for (int i=0; i < vItemMove.size(); i++) + for (unsigned int i=0; i < vItemMove.size(); i++) g->m.add_item(x, y, vItemMove[i]); g->m.i_clear(p.x, p.y); @@ -796,7 +796,7 @@ void construct::done_tree(game *g, point p) x = p.x + x * 3 + rng(-1, 1); y = p.y + y * 3 + rng(-1, 1); std::vector tree = line_to(p.x, p.y, x, y, rng(1, 8)); - for (int i = 0; i < tree.size(); i++) { + for (unsigned int i = 0; i < tree.size(); i++) { g->m.destroy(g, tree[i].x, tree[i].y, true); g->m.ter(tree[i].x, tree[i].y) = t_log; } @@ -834,6 +834,9 @@ void construct::done_tape(game *g, point p) case t_window: g->m.ter(p.x, p.y) = t_window_taped; + + default: + break; } } @@ -932,6 +935,9 @@ void construct::done_deconstruct(game *g, point p) g->m.add_item(p.x, p.y, g->itypes[itm_nail], 0, rng(12,16)); g->m.ter(p.x, p.y) = t_floor; break; + + default: + break; } } diff --git a/crafting.cpp b/crafting.cpp index e0233c36fe685..a9bafc39630ae 100644 --- a/crafting.cpp +++ b/crafting.cpp @@ -1129,7 +1129,7 @@ Press ? to describe object. Press to attempt to craft object."); } } } else{ - for (int i = 0; i < current.size() && i < 23; i++) { + for (unsigned int i = 0; i < current.size() && i < 23; i++) { if (i == line) mvwprintz(w_data, i, 0, (available[i] ? h_white : h_dkgray), itypes[current[i]->result]->name.c_str()); @@ -1171,7 +1171,7 @@ Press ? to describe object. Press to attempt to craft object."); xpos = 32; mvwputch(w_data, ypos, 30, col, '>'); - for (int j = 0; j < current[line]->tools[i].size(); j++) { + for (unsigned int j = 0; j < current[line]->tools[i].size(); j++) { itype_id type = current[line]->tools[i][j].type; int charges = current[line]->tools[i][j].count; nc_color toolcol = c_red; @@ -1212,7 +1212,7 @@ Press ? to describe object. Press to attempt to craft object."); mvwputch(w_data, ypos, 30, col, '>'); } xpos = 32; - for (int j = 0; j < current[line]->components[i].size(); j++) { + for (unsigned int j = 0; j < current[line]->components[i].size(); j++) { int count = current[line]->components[i][j].count; itype_id type = current[line]->components[i][j].type; nc_color compcol = c_red; @@ -1422,6 +1422,9 @@ void draw_recipe_tabs(WINDOW *w, craft_cat tab) mvwputch(w, 1, 65, h_ltgray, '<'); mvwputch(w, 1, 76, h_ltgray, '>'); break; + + default: + break; } wrefresh(w); } @@ -1448,7 +1451,7 @@ void game::pick_recipes(std::vector ¤t, current.clear(); available.clear(); - for (int i = 0; i < recipes.size(); i++) { + for (unsigned int i = 0; i < recipes.size(); i++) { // Check if the category matches the tab, and we have the requisite skills if (recipes[i]->category == tab && (recipes[i]->sk_primary == NULL || @@ -1461,7 +1464,7 @@ void game::pick_recipes(std::vector ¤t, } available.push_back(false); } - for (int i = 0; i < current.size() && i < 51; i++) { + for (unsigned int i = 0; i < current.size() && i < 51; i++) { //Check if we have the requisite tools and components for (int j = 0; j < 5; j++) { have_tool[j] = false; @@ -1469,7 +1472,7 @@ void game::pick_recipes(std::vector ¤t, if (current[i]->tools[j].size() == 0) have_tool[j] = true; else { - for (int k = 0; k < current[i]->tools[j].size(); k++) { + for (unsigned int k = 0; k < current[i]->tools[j].size(); k++) { itype_id type = current[i]->tools[j][k].type; int req = current[i]->tools[j][k].count; // -1 => 1 if ((req <= 0 && crafting_inv.has_amount (type, 1)) || @@ -1482,7 +1485,7 @@ void game::pick_recipes(std::vector ¤t, if (current[i]->components[j].size() == 0) have_comp[j] = true; else { - for (int k = 0; k < current[i]->components[j].size() && !have_comp[j]; k++){ + for (unsigned int k = 0; k < current[i]->components[j].size() && !have_comp[j]; k++){ itype_id type = current[i]->components[j][k].type; int count = current[i]->components[j][k].count; if (itypes[type]->count_by_charges() && count > 0) { @@ -1541,7 +1544,7 @@ void game::complete_craft() for (int i = 0; i < 5; i++) { if (making->components[i].size() > 0) { std::vector copy = making->components[i]; - for (int j = 0; j < copy.size(); j++) + for (unsigned int j = 0; j < copy.size(); j++) copy[j].count = rng(0, copy[j].count); consume_items(copy); } @@ -1616,7 +1619,7 @@ void game::consume_items(std::vector components) inventory map_inv; map_inv.form_from_map(this, point(u.posx, u.posy), PICKUP_RANGE); - for (int i = 0; i < components.size(); i++) { + for (unsigned int i = 0; i < components.size(); i++) { itype_id type = components[i].type; int count = abs(components[i].count); bool pl = false, mp = false; @@ -1663,13 +1666,13 @@ void game::consume_items(std::vector components) } else { // Let the player pick which component they want to use std::vector options; // List for the menu_vec below // Populate options with the names of the items - for (int i = 0; i < map_has.size(); i++) { + for (unsigned int i = 0; i < map_has.size(); i++) { std::string tmpStr = itypes[map_has[i].type]->name + " (nearby)"; options.push_back(tmpStr); } - for (int i = 0; i < player_has.size(); i++) + for (unsigned int i = 0; i < player_has.size(); i++) options.push_back(itypes[player_has[i].type]->name); - for (int i = 0; i < mixed.size(); i++) { + for (unsigned int i = 0; i < mixed.size(); i++) { std::string tmpStr = itypes[mixed[i].type]->name +" (on person & nearby)"; options.push_back(tmpStr); } @@ -1690,7 +1693,7 @@ void game::consume_items(std::vector components) } } - for (int i = 0; i < player_use.size(); i++) { + for (unsigned int i = 0; i < player_use.size(); i++) { if (itypes[player_use[i].type]->count_by_charges() && player_use[i].count > 0) u.use_charges(player_use[i].type, player_use[i].count); @@ -1698,7 +1701,7 @@ void game::consume_items(std::vector components) u.use_amount(player_use[i].type, abs(player_use[i].count), (player_use[i].count < 0)); } - for (int i = 0; i < map_use.size(); i++) { + for (unsigned int i = 0; i < map_use.size(); i++) { if (itypes[map_use[i].type]->count_by_charges() && map_use[i].count > 0) m.use_charges(point(u.posx, u.posy), PICKUP_RANGE, @@ -1708,7 +1711,7 @@ void game::consume_items(std::vector components) map_use[i].type, abs(map_use[i].count), (map_use[i].count < 0)); } - for (int i = 0; i < mixed_use.size(); i++) { + for (unsigned int i = 0; i < mixed_use.size(); i++) { if (itypes[mixed_use[i].type]->count_by_charges() && mixed_use[i].count > 0) { int from_map = mixed_use[i].count - u.charges_of(mixed_use[i].type); @@ -1734,7 +1737,7 @@ void game::consume_tools(std::vector tools) std::vector player_has; std::vector map_has; // Use charges of any tools that require charges used - for (int i = 0; i < tools.size() && !found_nocharge; i++) { + for (unsigned int i = 0; i < tools.size() && !found_nocharge; i++) { itype_id type = tools[i].type; if (tools[i].count > 0) { int count = tools[i].count; @@ -1756,11 +1759,11 @@ void game::consume_tools(std::vector tools) else { // Variety of options, list them and pick one // Populate the list std::vector options; - for (int i = 0; i < map_has.size(); i++) { + for (unsigned int i = 0; i < map_has.size(); i++) { std::string tmpStr = itypes[map_has[i].type]->name + " (nearby)"; options.push_back(tmpStr); } - for (int i = 0; i < player_has.size(); i++) + for (unsigned int i = 0; i < player_has.size(); i++) options.push_back(itypes[player_has[i].type]->name); if (options.size() == 0) // This SHOULD only happen if cooking with a fire, @@ -1795,7 +1798,7 @@ void game::disassemble() if (OPTIONS[OPT_QUERY_DISASSEMBLE] && !(query_yn("Really disassemble your %s?", dis_item->tname(this).c_str()))) return; - for (int i = 0; i < recipes.size(); i++) { + for (unsigned int i = 0; i < recipes.size(); i++) { if (dis_item->type == itypes[recipes[i]->result] && recipes[i]->reversible) // ok, a valid recipe exists for the item, and it is reversible // assign the activity @@ -1811,7 +1814,7 @@ void game::disassemble() have_tool[j] = true; else { - for (int k = 0; k < recipes[i]->tools[j].size(); k++) + for (unsigned int k = 0; k < recipes[i]->tools[j].size(); k++) { itype_id type = recipes[i]->tools[j][k].type; int req = recipes[i]->tools[j][k].count; // -1 => 1 diff --git a/defense.cpp b/defense.cpp index e44e963da555c..e001c965c85c7 100644 --- a/defense.cpp +++ b/defense.cpp @@ -144,11 +144,11 @@ void defense_game::pre_action(game *g, action_id &act) } } -void defense_game::post_action(game *g, action_id act) +void defense_game::post_action(game */*g*/, action_id /*act*/) { } -void defense_game::game_over(game *g) +void defense_game::game_over(game */*g*/) { popup("You managed to survive through wave %d!", current_wave); } @@ -175,8 +175,8 @@ void defense_game::init_mtypes(game *g) void defense_game::init_constructions(game *g) { - for (int i = 0; i < g->constructions.size(); i++) { - for (int j = 0; j < g->constructions[i]->stages.size(); j++) { + for (unsigned int i = 0; i < g->constructions.size(); i++) { + for (unsigned int j = 0; j < g->constructions[i]->stages.size(); j++) { g->constructions[i]->stages[j].time = 1; // Everything takes 1 minute } } @@ -184,7 +184,7 @@ void defense_game::init_constructions(game *g) void defense_game::init_recipes(game *g) { - for (int i = 0; i < g->recipes.size(); i++) { + for (unsigned int i = 0; i < g->recipes.size(); i++) { g->recipes[i]->time /= 10; // Things take turns, not minutes } } @@ -234,6 +234,9 @@ void defense_game::init_map(game *g) } g->cur_om.ter(50, 49) = ot_mansion_entrance; break; + + default: + break; } // Init the map int old_percent = 0; @@ -428,6 +431,10 @@ void defense_game::init_to_style(defense_style new_style) hunger = true; thirst = true; sleep = true; + break; + + default: + break; } } @@ -782,7 +789,7 @@ void defense_game::caravan(game *g) // Init the items for each category for (int i = 0; i < NUM_CARAVAN_CATEGORIES; i++) { items[i] = caravan_items( caravan_category(i) ); - for (int j = 0; j < items[i].size(); j++) { + for (unsigned int j = 0; j < items[i].size(); j++) { if (current_wave == 0 || !one_in(4)) item_count[i].push_back(0); // Init counts to 0 for each item else { // Remove the item @@ -891,14 +898,14 @@ Press Enter to buy everything in your cart, Esc to buy nothing."); total_price += caravan_price(g->u, g->itypes[tmp_itm]->price); if (category_selected == CARAVAN_CART) { // Find the item in its category for (int i = 1; i < NUM_CARAVAN_CATEGORIES; i++) { - for (int j = 0; j < items[i].size(); j++) { + for (unsigned int j = 0; j < items[i].size(); j++) { if (items[i][j] == tmp_itm) item_count[i][j]++; } } } else { // Add / increase the item in the shopping cart bool found_item = false; - for (int i = 0; i < items[0].size() && !found_item; i++) { + for (unsigned int i = 0; i < items[0].size() && !found_item; i++) { if (items[0][i] == tmp_itm) { found_item = true; item_count[0][i]++; @@ -925,14 +932,14 @@ Press Enter to buy everything in your cart, Esc to buy nothing."); total_price -= caravan_price(g->u, g->itypes[tmp_itm]->price); if (category_selected == CARAVAN_CART) { // Find the item in its category for (int i = 1; i < NUM_CARAVAN_CATEGORIES; i++) { - for (int j = 0; j < items[i].size(); j++) { + for (unsigned int j = 0; j < items[i].size(); j++) { if (items[i][j] == tmp_itm) item_count[i][j]--; } } } else { // Decrease / remove the item in the shopping cart bool found_item = false; - for (int i = 0; i < items[0].size() && !found_item; i++) { + for (unsigned int i = 0; i < items[0].size() && !found_item; i++) { if (items[0][i] == tmp_itm) { found_item = true; item_count[0][i]--; @@ -989,7 +996,7 @@ Press Enter to buy everything in your cart, Esc to buy nothing."); if (!cancel) { g->u.cash -= total_price; bool dropped_some = false; - for (int i = 0; i < items[0].size(); i++) { + for (unsigned int i = 0; i < items[0].size(); i++) { item tmp(g->itypes[ items[0][i] ], g->turn); tmp = tmp.in_its_container(&(g->itypes)); for (int j = 0; j < item_count[0][i]; j++) { @@ -1018,6 +1025,7 @@ std::string caravan_category_name(caravan_category cat) case CARAVAN_FOOD: return "Food & Drugs"; case CARAVAN_CLOTHES: return "Clothing & Armor"; case CARAVAN_TOOLS: return "Tools, Traps & Grenades"; + default: break; } return "BUG"; } @@ -1076,6 +1084,9 @@ itm_soldering_iron, itm_shovel, itm_jackhammer, itm_landmine, itm_teleporter, itm_grenade, itm_flashbang, itm_EMPbomb, itm_smokebomb, itm_bot_manhack, itm_bot_turret, itm_UPS_off, itm_mininuke, NULL); break; + + default: + break; } return ret; @@ -1200,7 +1211,7 @@ void defense_game::spawn_wave(game *g) valid = pick_monster_wave(g); while (diff > 0) { // Clear out any monsters that exceed our remaining difficulty - for (int i = 0; i < valid.size(); i++) { + for (unsigned int i = 0; i < valid.size(); i++) { if (g->mtypes[valid[i]]->difficulty > diff) { valid.erase(valid.begin() + i); i--; @@ -1290,7 +1301,7 @@ std::string defense_game::special_wave_message(std::string name) ret << "Wave " << current_wave << ": "; name[0] += 'A' - 'a'; // Capitalize - for (int i = 2; i < name.size(); i++) { + for (unsigned int i = 2; i < name.size(); i++) { if (name[i - 1] == ' ') name[i] += 'A' - 'a'; } diff --git a/disease.cpp b/disease.cpp index 6be703f93fd7a..9f2c63eeeac71 100644 --- a/disease.cpp +++ b/disease.cpp @@ -349,7 +349,7 @@ void dis_effect(game *g, player &p, disease &dis) case DI_ONFIRE: p.hurtall(3); - for (int i = 0; i < p.worn.size(); i++) { + for (unsigned int i = 0; i < p.worn.size(); i++) { if (p.worn[i].made_of(VEGGY) || p.worn[i].made_of(PAPER)) { p.worn.erase(p.worn.begin() + i); i--; @@ -948,19 +948,19 @@ void dis_effect(game *g, player &p, disease &dis) bool lesser = false; // Worn or wielded; diminished effects if (p.weapon.is_artifact() && p.weapon.is_tool()) { it_artifact_tool *tool = dynamic_cast(p.weapon.type); - for (int i = 0; i < tool->effects_carried.size(); i++) { + for (unsigned int i = 0; i < tool->effects_carried.size(); i++) { if (tool->effects_carried[i] == AEP_EVIL) lesser = true; } - for (int i = 0; i < tool->effects_wielded.size(); i++) { + for (unsigned int i = 0; i < tool->effects_wielded.size(); i++) { if (tool->effects_wielded[i] == AEP_EVIL) lesser = true; } } - for (int i = 0; !lesser && i < p.worn.size(); i++) { + for (unsigned int i = 0; !lesser && i < p.worn.size(); i++) { if (p.worn[i].is_artifact()) { it_artifact_armor *armor = dynamic_cast(p.worn[i].type); - for (int i = 0; i < armor->effects_worn.size(); i++) { + for (unsigned int i = 0; i < armor->effects_worn.size(); i++) { if (armor->effects_worn[i] == AEP_EVIL) lesser = true; } @@ -982,6 +982,9 @@ void dis_effect(game *g, player &p, disease &dis) p.per_cur -= (dis.duration > 4000 ? 10 : int(dis.duration / 400)); } } break; + + default: + break; } } diff --git a/event.cpp b/event.cpp index 923fcdfafd0df..08bc4ef09a5af 100644 --- a/event.cpp +++ b/event.cpp @@ -67,7 +67,7 @@ void event::actualize(game *g) case EVENT_AMIGARA: { int num_horrors = rng(3, 5); int faultx = -1, faulty = -1; - bool horizontal; + bool horizontal = true; for (int x = 0; x < SEEX * MAPSIZE && faultx == -1; x++) { for (int y = 0; y < SEEY * MAPSIZE && faulty == -1; y++) { if (g->m.ter(x, y) == t_fault) { diff --git a/faction.cpp b/faction.cpp index dc24b7e875c38..2412d2bc3f7d2 100644 --- a/faction.cpp +++ b/faction.cpp @@ -57,7 +57,7 @@ faction::faction(int uid) mapy = 0; size = 0; power = 0; - uid = id; + id = uid; } diff --git a/field.cpp b/field.cpp index 3c0b3e7ac2de1..c2cc4fbac7d81 100644 --- a/field.cpp +++ b/field.cpp @@ -55,7 +55,7 @@ bool map::process_fields_in_submap(game *g, int gridn) case fd_acid: if (has_flag(swimmable, x, y)) // Dissipate faster in water cur->age += 20; - for (int i = 0; i < i_at(x, y).size(); i++) { + for (unsigned int i = 0; i < i_at(x, y).size(); i++) { item *melting = &(i_at(x, y)[i]); if (melting->made_of(LIQUID) || melting->made_of(VEGGY) || melting->made_of(FLESH) || melting->made_of(POWDER) || @@ -67,7 +67,7 @@ bool map::process_fields_in_submap(game *g, int gridn) if (melting->damage >= 5 || (melting->made_of(PAPER) && melting->damage >= 3)) { cur->age += melting->volume(); - for (int m = 0; m < i_at(x, y)[i].contents.size(); m++) + for (unsigned int m = 0; m < i_at(x, y)[i].contents.size(); m++) i_at(x, y).push_back( i_at(x, y)[i].contents[m] ); i_at(x, y).erase(i_at(x, y).begin() + i); i--; @@ -83,7 +83,7 @@ bool map::process_fields_in_submap(game *g, int gridn) // Consume items as fuel to help us grow/last longer. bool destroyed = false; int vol = 0, smoke = 0, consumed = 0; - for (int i = 0; i < i_at(x, y).size() && consumed < cur->density * 2; i++) { + for (unsigned int i = 0; i < i_at(x, y).size() && consumed < cur->density * 2; i++) { destroyed = false; vol = i_at(x, y)[i].volume(); item *it = &(i_at(x, y)[i]); @@ -169,7 +169,7 @@ bool map::process_fields_in_submap(game *g, int gridn) } if (destroyed) { - for (int m = 0; m < i_at(x, y)[i].contents.size(); m++) + for (unsigned int m = 0; m < i_at(x, y)[i].contents.size(); m++) i_at(x, y).push_back( i_at(x, y)[i].contents[m] ); i_at(x, y).erase(i_at(x, y).begin() + i); i--; @@ -538,7 +538,7 @@ bool map::process_fields_in_submap(game *g, int gridn) case fd_push_items: { std::vector *it = &(i_at(x, y)); - for (int i = 0; i < it->size(); i++) { + for (unsigned int i = 0; i < it->size(); i++) { if ((*it)[i].type->id != itm_rock || (*it)[i].bday >= int(g->turn) - 1) i++; else { @@ -642,6 +642,8 @@ bool map::process_fields_in_submap(game *g, int gridn) } break; + default: + break; } // switch (curtype) cur->age++; @@ -711,11 +713,12 @@ void map::step_in_field(int x, int y, game *g) case fd_fire: adjusted_intensity = cur->density; - if( g->u.in_vehicle ) + if( g->u.in_vehicle ){ if( inside ) adjusted_intensity -= 2; else adjusted_intensity -= 1; + } if (!g->u.has_active_bionic(bio_heatsink)) { if (adjusted_intensity == 1) { g->add_msg("You burn your legs and feet!"); @@ -747,15 +750,20 @@ void map::step_in_field(int x, int y, game *g) g->u.infect(DI_SMOKE, bp_mouth, 4, 15, g); break; + // If tear gas, toxic gas, and/or nuke gas don't behave as expected it's likely + // due to how they've been grouped together within the parentheses. + // I tried my best to bracket them in what made the most sense but I'm leaving + // a note about it just incase. + // - AkrionXxarr case fd_tear_gas: - if ((cur->density > 1 || !one_in(3)) && !inside || inside && one_in(3)) + if (((cur->density > 1 || !one_in(3)) && !inside) || (inside && one_in(3))) g->u.infect(DI_TEARGAS, bp_mouth, 5, 20, g); - if (cur->density > 1 && !inside || inside && one_in(3)) + if ((cur->density > 1 && !inside) || (inside && one_in(3))) g->u.infect(DI_BLIND, bp_eyes, cur->density * 2, 10, g); break; case fd_toxic_gas: - if (cur->density == 2 && !inside || cur->density == 3 && inside ) + if ((cur->density == 2 && !inside) || (cur->density == 3 && inside)) g->u.infect(DI_POISON, bp_mouth, 5, 30, g); else if (cur->density == 3 && !inside) g->u.infect(DI_BADPOISON, bp_mouth, 5, 30, g); @@ -805,6 +813,9 @@ void map::step_in_field(int x, int y, game *g) case fd_acid_vent: remove_field(x, y); break; + + default: + break; } } @@ -974,6 +985,8 @@ void map::mon_in_field(int x, int y, game *g, monster *z) } break; + default: + break; } if (dam > 0) z->hurt(dam); @@ -981,7 +994,7 @@ void map::mon_in_field(int x, int y, game *g, monster *z) bool vector_has(std::vector vec, itype_id type) { - for (int i = 0; i < vec.size(); i++) { + for (unsigned int i = 0; i < vec.size(); i++) { if (vec[i].type->id == type) return true; } diff --git a/game.cpp b/game.cpp index 54b8a7bae4508..b0ceef2fdcd47 100644 --- a/game.cpp +++ b/game.cpp @@ -101,9 +101,9 @@ game::game() : game::~game() { delete gamemode; - for (int i = 0; i < itypes.size(); i++) + for (unsigned int i = 0; i < itypes.size(); i++) delete itypes[i]; - for (int i = 0; i < mtypes.size(); i++) + for (unsigned int i = 0; i < mtypes.size(); i++) delete mtypes[i]; delwin(w_terrain); delwin(w_minimap); @@ -243,7 +243,7 @@ Please report bugs to TheDarklingWolf@gmail.com or post on the forums."); mvwprintz(w_open, 10, 1, (sel1 == 6 ? h_white : c_white), "Quit"); if (sel1 == 0) { // Print the MOTD. - for (int i = 0; i < motd.size() && i < 16; i++) + for (unsigned int i = 0; i < motd.size() && i < 16; i++) mvwprintz(w_open, i + 4, 12, c_ltred, motd[i].c_str()); } else { // Clear the lines if not viewing MOTD. for (int i = 4; i < 20; i++) { @@ -357,7 +357,7 @@ fivedozenwhales@gmail.com."); for (int i = savestart; i < saveend; i++) { int line = 6 + i - savestart; mvwprintz(w_open, line, 12, c_black, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); - if (i < savegames.size()) + if (unsigned(i) < savegames.size()) mvwprintz(w_open, line, 12, (sel2 - 1 == i ? h_white : c_white), savegames[i].c_str()); } @@ -371,7 +371,7 @@ fivedozenwhales@gmail.com."); else sel2 = savegames.size(); } else if (ch == 'j') { - if (sel2 < savegames.size()) + if (unsigned(sel2) < savegames.size()) sel2++; else sel2 = 1; @@ -445,7 +445,7 @@ fivedozenwhales@gmail.com."); for (int i = tempstart; i < tempend; i++) { int line = 6 + i - tempstart; mvwprintz(w_open, line, 29, c_black, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); - if (i < templates.size()) + if (unsigned(i) < templates.size()) mvwprintz(w_open, line, 29, (sel1 == i ? h_white : c_white), templates[i].c_str()); } @@ -459,7 +459,7 @@ fivedozenwhales@gmail.com."); else sel1 = templates.size() - 1; } else if (ch == 'j') { - if (sel1 < templates.size() - 1) + if (unsigned(sel1) < templates.size() - 1) sel1++; else sel1 = 0; @@ -574,7 +574,7 @@ void game::create_starting_npcs() void game::cleanup_at_end(){ write_msg(); // Save the monsters before we die! - for (int i = 0; i < z.size(); i++) { + for (unsigned int i = 0; i < z.size(); i++) { if (z[i].spawnmapx != -1) { // Static spawn, move them back there tinymap tmp(&itypes, &mapitems, &traps); tmp.load(this, z[i].spawnmapx, z[i].spawnmapy, false); @@ -765,7 +765,7 @@ void game::update_bodytemp() // TODO bionics, diseases and humidity (not in yet) int morale_pen = 0; // Fetch the morale value of wetness for bodywetness int bodywetness = 0; - for (int i = 0; bodywetness == 0 && i < u.morale.size(); i++) + for (unsigned int i = 0; bodywetness == 0 && i < u.morale.size(); i++) if( u.morale[i].type == MORALE_WET ) { bodywetness = abs(u.morale[i].bonus); // Make it positive, less confusing break; @@ -816,6 +816,7 @@ void game::update_bodytemp() // TODO bionics, diseases and humidity (not in yet) } // TODO Balance bionics // Bionic "Internal Climate Control" says it is effective from 0F to 140F, these are the corresponding bodytemp values + // Bug: temperature < 140 will always result true because temperature is a signed char. - AkrionXxarr if (u.has_bionic(bio_climate) && temperature > 0 && temperature < 140) temp_conv = (9*BODYTEMP_NORM + temp_conv)/10; // Bionic "eases" the effects // Bionic "Thermal Dissapation" says it prevents fire damage up to 2000F. 500 is picked at random... @@ -910,7 +911,7 @@ void game::rustCheck() { void game::process_events() { - for (int i = 0; i < events.size(); i++) { + for (unsigned int i = 0; i < events.size(); i++) { events[i].per_turn(this); if (events[i].turn <= int(turn)) { events[i].actualize(this); @@ -1054,6 +1055,9 @@ void game::process_activity() case ACT_VEHICLE: complete_vehicle (this); break; + + default: + break; } bool act_veh = (u.activity.type == ACT_VEHICLE); @@ -1244,8 +1248,8 @@ int game::reserve_random_mission(mission_origin origin, point p, int npc_id) { std::vector valid; mission_place place; - for (int i = 0; i < mission_types.size(); i++) { - for (int j = 0; j < mission_types[i].origins.size(); j++) { + for (unsigned int i = 0; i < mission_types.size(); i++) { + for (unsigned int j = 0; j < mission_types[i].origins.size(); j++) { if (mission_types[i].origins[j] == origin && (place.*mission_types[i].place)(this, p.x, p.y)) { valid.push_back(i); @@ -1264,11 +1268,11 @@ int game::reserve_random_mission(mission_origin origin, point p, int npc_id) npc* game::find_npc(int id) { - for (int i = 0; i < active_npc.size(); i++) { + for (unsigned int i = 0; i < active_npc.size(); i++) { if (active_npc[i].id == id) return &(active_npc[i]); } - for (int i = 0; i < cur_om.npcs.size(); i++) { + for (unsigned int i = 0; i < cur_om.npcs.size(); i++) { if (cur_om.npcs[i].id == id) return &(cur_om.npcs[i]); } @@ -1277,7 +1281,7 @@ npc* game::find_npc(int id) mission* game::find_mission(int id) { - for (int i = 0; i < active_missions.size(); i++) { + for (unsigned int i = 0; i < active_missions.size(); i++) { if (active_missions[i].uid == id) return &(active_missions[i]); } @@ -1286,7 +1290,7 @@ mission* game::find_mission(int id) mission_type* game::find_mission_type(int id) { - for (int i = 0; i < active_missions.size(); i++) { + for (unsigned int i = 0; i < active_missions.size(); i++) { if (active_missions[i].uid == id) return active_missions[i].type; } @@ -1324,7 +1328,7 @@ bool game::mission_complete(int id, int npc_id) case MGOAL_FIND_MONSTER: if (miss->npc_id != -1 && miss->npc_id != npc_id) return false; - for (int i = 0; i < z.size(); i++) { + for (unsigned int i = 0; i < z.size(); i++) { if (z[i].mission_id == miss->uid) return true; } @@ -1352,7 +1356,7 @@ void game::wrap_up_mission(int id) { mission *miss = find_mission(id); u.completed_missions.push_back( id ); - for (int i = 0; i < u.active_missions.size(); i++) { + for (unsigned int i = 0; i < u.active_missions.size(); i++) { if (u.active_missions[i] == id) { u.active_missions.erase( u.active_missions.begin() + i ); i--; @@ -1365,6 +1369,8 @@ void game::wrap_up_mission(int id) case MGOAL_FIND_ANY_ITEM: u.remove_mission_items(miss->uid); break; + default: + break; } mission_end endfunc; (endfunc.*miss->type->end)(this, miss); @@ -1375,7 +1381,7 @@ void game::fail_mission(int id) mission *miss = find_mission(id); miss->failed = true; u.failed_missions.push_back( id ); - for (int i = 0; i < u.active_missions.size(); i++) { + for (unsigned int i = 0; i < u.active_missions.size(); i++) { if (u.active_missions[i] == id) { u.active_missions.erase( u.active_missions.begin() + i ); i--; @@ -1394,7 +1400,7 @@ void game::mission_step_complete(int id, int step) case MGOAL_FIND_MONSTER: case MGOAL_KILL_MONSTER: { bool npc_found = false; - for (int i = 0; i < cur_om.npcs.size(); i++) { + for (unsigned int i = 0; i < cur_om.npcs.size(); i++) { if (cur_om.npcs[i].id == miss->npc_id) { miss->target = point(cur_om.npcs[i].mapx, cur_om.npcs[i].mapy); npc_found = true; @@ -1403,12 +1409,14 @@ void game::mission_step_complete(int id, int step) if (!npc_found) miss->target = point(-1, -1); } break; + default: + break; } } void game::process_missions() { - for (int i = 0; i < active_missions.size(); i++) { + for (unsigned int i = 0; i < active_missions.size(); i++) { if (active_missions[i].deadline > 0 && int(turn) > active_missions[i].deadline) fail_mission(active_missions[i].uid); @@ -1779,7 +1787,7 @@ input_ret game::get_input(int timeout_ms) your_body.make_corpse(itypes[itm_corpse], mtypes[mon_null], turn); your_body.name = u.name; m.add_item(u.posx, u.posy, your_body); - for (int i = 0; i < tmp.size(); i++) + for (unsigned int i = 0; i < tmp.size(); i++) m.add_item(u.posx, u.posy, tmp[i]); uquit = QUIT_SUICIDE; } @@ -1903,7 +1911,7 @@ bool game::is_game_over() your_body.make_corpse(itypes[itm_corpse], mtypes[mon_null], turn); your_body.name = u.name; m.add_item(u.posx, u.posy, your_body); - for (int i = 0; i < tmp.size(); i++) + for (unsigned int i = 0; i < tmp.size(); i++) m.add_item(u.posx, u.posy, tmp[i]); std::stringstream playerfile; playerfile << "save/" << u.name << ".sav"; @@ -2140,7 +2148,7 @@ void game::save() } // Now save all monsters. fout << std::endl << z.size() << std::endl; - for (int i = 0; i < z.size(); i++) + for (unsigned int i = 0; i < z.size(); i++) fout << z[i].save_info() << std::endl; for (int i = 0; i < num_monsters; i++) // Save the kill counts, too. fout << kills[i] << " "; @@ -2154,15 +2162,15 @@ void game::save() fout << next_mission_id << " " << next_faction_id << " " << next_npc_id << " " << active_missions.size() << " "; - for (int i = 0; i < active_missions.size(); i++) + for (unsigned int i = 0; i < active_missions.size(); i++) fout << active_missions[i].save_info() << " "; fout << factions.size() << std::endl; - for (int i = 0; i < factions.size(); i++) + for (unsigned int i = 0; i < factions.size(); i++) fout << factions[i].save_info() << std::endl; fout << active_npc.size() << std::endl; - for (int i = 0; i < active_npc.size(); i++) { + for (unsigned int i = 0; i < active_npc.size(); i++) { active_npc[i].mapx = levx; active_npc[i].mapy = levy; fout << active_npc[i].save_info() << std::endl; @@ -2173,7 +2181,7 @@ void game::save() // Finally, save artifacts. if (itypes.size() > num_all_items) { fout.open("save/artifacts.gsav"); - for (int i = num_all_items; i < itypes.size(); i++) + for (unsigned int i = num_all_items; i < itypes.size(); i++) fout << itypes[i]->save_data() << "\n"; fout.close(); } @@ -2279,7 +2287,7 @@ void game::add_event(event_type type, int on_turn, int faction_id, int x, int y) bool game::event_queued(event_type type) { - for (int i = 0; i < events.size(); i++) { + for (unsigned int i = 0; i < events.size(); i++) { if (events[i].type == type) return true; } @@ -2374,7 +2382,7 @@ z.size(), events.size()); break; case 8: - for (int i = 0; i < active_npc.size(); i++) { + for (unsigned int i = 0; i < active_npc.size(); i++) { add_msg("%s's head implodes!", active_npc[i].name.c_str()); active_npc[i].hp_cur[bp_head] = 0; } @@ -2390,7 +2398,7 @@ z.size(), events.size()); debugmsg ("There's already vehicle here"); } else { - for (int i = 2; i < vtypes.size(); i++) + for (unsigned int i = 2; i < vtypes.size(); i++) opts.push_back (vtypes[i]->name); opts.push_back (std::string("Cancel")); veh_num = menu_vec ("Choose vehicle to spawn", opts) + 1; @@ -2456,7 +2464,7 @@ z.size(), events.size()); void game::mondebug() { int tc; - for (int i = 0; i < z.size(); i++) { + for (unsigned int i = 0; i < z.size(); i++) { z[i].debug(u); if (z[i].has_flag(MF_SEES) && m.sees(z[i].posx, z[i].posy, u.posx, u.posy, -1, tc)) @@ -2472,7 +2480,7 @@ void game::groupdebug() mvprintw(0, 0, "OM %d : %d M %d : %d", cur_om.posx, cur_om.posy, levx, levy); int dist, linenum = 1; - for (int i = 0; i < cur_om.zg.size(); i++) { + for (unsigned int i = 0; i < cur_om.zg.size(); i++) { dist = trig_dist(levx, levy, cur_om.zg[i].posx, cur_om.zg[i].posy); if (dist <= cur_om.zg[i].radius) { mvprintw(linenum, 0, "Zgroup %d: Centered at %d:%d, radius %d, pop %d", @@ -2514,7 +2522,7 @@ void game::disp_kills() return; } - for (int i = 0; i < types.size(); i++) { + for (unsigned int i = 0; i < types.size(); i++) { if (i < 24) { mvwprintz(w, i + 1, 0, types[i]->color, "%c %s", types[i]->sym, types[i]->name.c_str()); @@ -2554,7 +2562,7 @@ void game::disp_NPCs() mvwprintz(w, 0, 0, c_white, "Your position: %d:%d", levx, levy); std::vector closest; closest.push_back(&cur_om.npcs[0]); - for (int i = 1; i < cur_om.npcs.size(); i++) { + for (unsigned int i = 1; i < cur_om.npcs.size(); i++) { if (closest.size() < 20) closest.push_back(&cur_om.npcs[i]); else if (rl_dist(levx, levy, cur_om.npcs[i].mapx, cur_om.npcs[i].mapy) < @@ -2583,7 +2591,7 @@ void game::disp_NPCs() faction* game::list_factions(std::string title) { std::vector valfac; // Factions that we know of. - for (int i = 0; i < factions.size(); i++) { + for (unsigned int i = 0; i < factions.size(); i++) { if (factions[i].known_by_u) valfac.push_back(factions[i]); } @@ -2598,7 +2606,7 @@ faction* game::list_factions(std::string title) // Init w_list content mvwprintz(w_list, 0, 0, c_white, title.c_str()); - for (int i = 0; i < valfac.size(); i++) { + for (unsigned int i = 0; i < valfac.size(); i++) { nc_color col = (i == 0 ? h_white : c_white); mvwprintz(w_list, i + 1, 0, col, valfac[i].name.c_str()); } @@ -4073,6 +4081,9 @@ void game::emp_blast(int x, int y) if (rn >= 40 && rn <= 80) add_msg("Nothing happens."); break; + + default: + break; } int mondex = mon_at(x, y); if (mondex != -1) { @@ -5210,6 +5221,9 @@ shape, but with long, twisted, distended limbs."); m.ter(x, y) = t_rock_blue; } break; + + default: + break; } } } diff --git a/gamemode.h b/gamemode.h index 42df0abdc0333..4604b3377a1a8 100644 --- a/gamemode.h +++ b/gamemode.h @@ -24,16 +24,16 @@ struct special_game { virtual special_game_id id() { return SGAME_NULL; }; // init is run when the game begins - virtual bool init(game *) { return true; }; + virtual bool init(game */*g*/) { return true; }; // per_turn is run every turn--before any player actions - virtual void per_turn(game *) { }; + virtual void per_turn(game */*g*/) { }; // pre_action is run after a keypress, but before the game handles the action // It may modify the action, e.g. to cancel it - virtual void pre_action(game *, action_id &) { }; + virtual void pre_action(game */*g*/, action_id &/*act*/) { }; // post_action is run after the game handles the action - virtual void post_action(game *, action_id) { }; + virtual void post_action(game */*g*/, action_id /*act*/) { }; // game_over is run when the player dies (or the game otherwise ends) - virtual void game_over(game *) { }; + virtual void game_over(game */*g*/) { }; }; @@ -71,7 +71,7 @@ struct tutorial_game : public special_game virtual void per_turn(game *g); virtual void pre_action(game *g, action_id &act); virtual void post_action(game *g, action_id act); - virtual void game_over(game *) { }; + virtual void game_over(game */*g*/) { }; private: void add_message(game *g, tut_lesson lesson); diff --git a/itype.h b/itype.h index e8ba62fc78c00..38a2346cb8e3c 100644 --- a/itype.h +++ b/itype.h @@ -568,7 +568,7 @@ struct it_var_veh_part: public itype char psym, nc_color pcolor, material pm1, material pm2, unsigned short pvolume, unsigned short pweight, signed char pmelee_dam, signed char pmelee_cut, signed char pm_to_hit, - unsigned, + unsigned /*effects*/, unsigned int big_min, unsigned int big_max, diff --git a/iuse.h b/iuse.h index 182178c795882..0288ce5cfc3e4 100644 --- a/iuse.h +++ b/iuse.h @@ -8,7 +8,7 @@ class player; class iuse { public: - void none (game *, player *, item *, bool ) { }; + void none (game */*g*/, player */*p*/, item */*it*/, bool /*t*/) { }; // FOOD AND DRUGS (ADMINISTRATION) void sewage (game *g, player *p, item *it, bool t); diff --git a/mission.h b/mission.h index 86fd06a02daff..1ddef562c864b 100644 --- a/mission.h +++ b/mission.h @@ -47,8 +47,8 @@ enum mission_goal { }; struct mission_place { // Return true if [posx,posy] is valid in overmap - bool never (game *, int, int) { return false; } - bool always (game *, int, int) { return true; } + bool never (game */*g*/, int /*posx*/, int /*posy*/) { return false; } + bool always (game */*g*/, int /*posx*/, int /*posy*/) { return true; } bool near_town (game *g, int posx, int posy); }; diff --git a/monattack.h b/monattack.h index a69478808f287..754d90c9a9bba 100644 --- a/monattack.h +++ b/monattack.h @@ -8,7 +8,7 @@ class game; class mattack { public: - void none (game *, monster *) { }; + void none (game */*g*/, monster */*z*/) { }; void antqueen (game *g, monster *z); void shriek (game *g, monster *z); void acid (game *g, monster *z); diff --git a/omdata.h b/omdata.h index b73b557e8be22..4b2c416f194af 100644 --- a/omdata.h +++ b/omdata.h @@ -379,8 +379,8 @@ NUM_OMS_FLAGS struct omspec_place { // Able functions - true if p is valid - bool never (overmap *, point) { return false; } - bool always (overmap *, point) { return true; } + bool never (overmap */*om*/, point /*p*/) { return false; } + bool always (overmap */*om*/, point /*p*/) { return true; } bool water (overmap *om, point p); // Only on rivers bool land (overmap *om, point p); // Only on land (no rivers) bool forest (overmap *om, point p); // Forest diff --git a/settlement.h b/settlement.h index 3d75a18097e27..295d1e8e740a6 100644 --- a/settlement.h +++ b/settlement.h @@ -11,7 +11,7 @@ struct settlement { settlement(int mapx, int mapy); void pick_faction(game *g, int omx, int omy); void set_population(); - void populate(game *) { }; + void populate(game */*g*/) { }; int num(oter_id ter); void add_building(oter_id ter); diff --git a/trap.h b/trap.h index 860064c4532c9..ae374bb7214db 100644 --- a/trap.h +++ b/trap.h @@ -46,10 +46,10 @@ enum trap_id { struct trap; struct trapfunc { - void none (game *, int, int) { }; + void none (game */*g*/, int /*x*/, int /*y*/) { }; void bubble (game *g, int x, int y); void beartrap (game *g, int x, int y); - void snare (game *, int, int) { }; + void snare (game */*g*/, int /*x*/, int /*y*/) { }; void board (game *g, int x, int y); void tripwire (game *g, int x, int y); void crossbow (game *g, int x, int y); @@ -63,7 +63,7 @@ struct trapfunc { void pit (game *g, int x, int y); void pit_spikes (game *g, int x, int y); void lava (game *g, int x, int y); - void portal (game *, int, int) { }; + void portal (game */*g*/, int /*x*/, int /*y*/) { }; void ledge (game *g, int x, int y); void boobytrap (game *g, int x, int y); void temple_flood (game *g, int x, int y); @@ -76,7 +76,7 @@ struct trapfunc { }; struct trapfuncm { - void none (game *, monster *, int , int) { }; + void none (game */*g*/, monster */*z*/, int /*x*/, int /*y*/) { }; void bubble (game *g, monster *z, int x, int y); void cot (game *g, monster *z, int x, int y); void beartrap (game *g, monster *z, int x, int y); @@ -85,16 +85,16 @@ struct trapfuncm { void crossbow (game *g, monster *z, int x, int y); void shotgun (game *g, monster *z, int x, int y); void blade (game *g, monster *z, int x, int y); - void snare (game *, monster *, int, int) { }; + void snare (game */*g*/, monster */*z*/, int /*x*/, int /*y*/) { }; void landmine (game *g, monster *z, int x, int y); void telepad (game *g, monster *z, int x, int y); void goo (game *g, monster *z, int x, int y); void dissector (game *g, monster *z, int x, int y); - void sinkhole (game *, monster *, int, int) { }; + void sinkhole (game */*g*/, monster */*z*/, int /*x*/, int /*y*/) { }; void pit (game *g, monster *z, int x, int y); void pit_spikes(game *g, monster *z, int x, int y); void lava (game *g, monster *z, int x, int y); - void portal (game *, monster *, int, int) { }; + void portal (game */*g*/, monster */*z*/, int /*x*/, int /*y*/) { }; void ledge (game *g, monster *z, int x, int y); void boobytrap (game *g, monster *z, int x, int y); void glow (game *g, monster *z, int x, int y); From 0f657dee940e5249e54fcff7e915f24d274c94b4 Mon Sep 17 00:00:00 2001 From: AkrionXxarr Date: Wed, 27 Feb 2013 15:41:30 -0800 Subject: [PATCH 4/6] Further warning resolutions. Specifically defaulting switch statements. Further warning resolutions. --- addiction.h | 3 +++ bionics.cpp | 4 ++-- construction.cpp | 2 +- game.cpp | 3 +++ gamemode.h | 12 ++++++------ itypedef.cpp | 1 + iuse.cpp | 3 +++ iuse.h | 2 +- lightmap.cpp | 2 ++ map.cpp | 11 +++++++++++ mapgen.cpp | 31 +++++++++++++++++++++++++++++++ melee.cpp | 4 ++++ mission.cpp | 15 +++++++++++++++ mission.h | 4 ++-- mission_start.cpp | 3 +++ monattack.cpp | 1 + monattack.h | 2 +- monster.cpp | 5 +++++ mtypedef.cpp | 4 ++++ mutation.cpp | 6 ++++++ mutation_data.cpp | 2 ++ newcharacter.cpp | 3 +++ npc.cpp | 16 ++++++++++++++++ npcmove.cpp | 2 ++ npctalk.cpp | 7 +++++++ omdata.h | 4 ++-- output.cpp | 5 +++++ overmap.cpp | 3 +++ player.cpp | 3 +++ settlement.h | 2 +- trap.h | 14 +++++++------- trapfunc.cpp | 2 ++ tutorial.cpp | 3 +++ 33 files changed, 161 insertions(+), 23 deletions(-) diff --git a/addiction.h b/addiction.h index ed7d1d01a2d02..36269876ba58a 100644 --- a/addiction.h +++ b/addiction.h @@ -155,6 +155,9 @@ void addict_effect(game *g, addiction &add) g->u.stim -= 3; } break; + + default: + break; } } diff --git a/bionics.cpp b/bionics.cpp index 50bd67fd7963b..0069f66e968a8 100644 --- a/bionics.cpp +++ b/bionics.cpp @@ -456,7 +456,7 @@ charge mechanism, which must be installed from another CBM.", BATTERY_AMOUNT); return false; } - int selection = 0; + unsigned selection = 0; char ch; do { @@ -568,7 +568,7 @@ void bionics_install_failure(game *g, player *u, int success) fail_text += " and "; fail_text += (u->my_bionics.size() <= failure_level ? "all" : "some"); fail_text += " of your existing bionics are lost."; - for (int i = 0; i < failure_level && u->my_bionics.size() > 0; i++) { + for (unsigned int i = 0; i < failure_level && u->my_bionics.size() > 0; i++) { int rem = rng(0, u->my_bionics.size() - 1); u->my_bionics.erase(u->my_bionics.begin() + rem); } diff --git a/construction.cpp b/construction.cpp index f86865151c413..443558742f3be 100644 --- a/construction.cpp +++ b/construction.cpp @@ -263,7 +263,7 @@ void game::construction_menu() wrefresh(w_con); bool update_info = true; - int select = 0; + unsigned int select = 0; char ch; inventory total_inv = crafting_inventory(); diff --git a/game.cpp b/game.cpp index b0ceef2fdcd47..ab18937be6a6c 100644 --- a/game.cpp +++ b/game.cpp @@ -1836,6 +1836,9 @@ input_ret game::get_input(int timeout_ms) debugmon = !debugmon; add_msg("Debug messages %s!", (debugmon ? "ON" : "OFF")); break; + + default: + break; } gamemode->post_action(this, act); diff --git a/gamemode.h b/gamemode.h index 4604b3377a1a8..e04d77fd50e42 100644 --- a/gamemode.h +++ b/gamemode.h @@ -24,16 +24,16 @@ struct special_game { virtual special_game_id id() { return SGAME_NULL; }; // init is run when the game begins - virtual bool init(game */*g*/) { return true; }; + virtual bool init(game * /*g*/) { return true; }; // per_turn is run every turn--before any player actions - virtual void per_turn(game */*g*/) { }; + virtual void per_turn(game * /*g*/) { }; // pre_action is run after a keypress, but before the game handles the action // It may modify the action, e.g. to cancel it - virtual void pre_action(game */*g*/, action_id &/*act*/) { }; + virtual void pre_action(game * /*g*/, action_id & /*act*/) { }; // post_action is run after the game handles the action - virtual void post_action(game */*g*/, action_id /*act*/) { }; + virtual void post_action(game * /*g*/, action_id /*act*/) { }; // game_over is run when the player dies (or the game otherwise ends) - virtual void game_over(game */*g*/) { }; + virtual void game_over(game * /*g*/) { }; }; @@ -71,7 +71,7 @@ struct tutorial_game : public special_game virtual void per_turn(game *g); virtual void pre_action(game *g, action_id &act); virtual void post_action(game *g, action_id act); - virtual void game_over(game */*g*/) { }; + virtual void game_over(game * /*g*/) { }; private: void add_message(game *g, tut_lesson lesson); diff --git a/itypedef.cpp b/itypedef.cpp index 3e0f20111c382..9c1b83dabe106 100644 --- a/itypedef.cpp +++ b/itypedef.cpp @@ -4677,6 +4677,7 @@ itype_id default_ammo(ammotype guntype) case AT_PLUT: return itm_plut_cell; case AT_GAS: return itm_gasoline; case AT_THREAD:return itm_thread; + default: break; } return itm_null; } diff --git a/iuse.cpp b/iuse.cpp index 29b8bf141da55..40588450c729c 100644 --- a/iuse.cpp +++ b/iuse.cpp @@ -2172,6 +2172,7 @@ void iuse::tazer(game *g, player *p, item *it, bool t) case MS_SMALL: numdice -= 1; break; case MS_LARGE: numdice += 2; break; case MS_HUGE: numdice += 4; break; + default: break; } int mondice = z->dodge(); if (dice(numdice, 10) < dice(mondice, 10)) { // A miss! @@ -3408,6 +3409,8 @@ void iuse::artifact(game *g, player *p, item *it, bool t) g->add_msg_if_player(p,"A shadow forms nearby."); } break; + default: + break; } } } diff --git a/iuse.h b/iuse.h index 0288ce5cfc3e4..84be13574a4c8 100644 --- a/iuse.h +++ b/iuse.h @@ -8,7 +8,7 @@ class player; class iuse { public: - void none (game */*g*/, player */*p*/, item */*it*/, bool /*t*/) { }; + void none (game * /*g*/, player * /*p*/, item * /*it*/, bool /*t*/) { }; // FOOD AND DRUGS (ADMINISTRATION) void sewage (game *g, player *p, item *it, bool t); diff --git a/lightmap.cpp b/lightmap.cpp index e8e43e2d5ef19..487f9f5db9435 100644 --- a/lightmap.cpp +++ b/lightmap.cpp @@ -102,6 +102,8 @@ void light_map::generate(game* g, int x, int y, float natural_light, float lumin else apply_light_source(sx, sy, x, y, LIGHT_SOURCE_LOCAL); // kinda a hack as the square will still get marked break; + default: + break; } // Apply any vehicle light sources diff --git a/map.cpp b/map.cpp index 47f9a515cd9a7..808404db60205 100644 --- a/map.cpp +++ b/map.cpp @@ -975,6 +975,8 @@ bool map::has_adjacent_furniture(const int x, const int y) case t_bookcase: case t_locker: return true; + default: + break; } return false; } @@ -1523,6 +1525,8 @@ case t_wall_log: sound += "wham!"; return true; } + default: + break; } if (res) *res = result; if (move_cost(x, y) == 0) { @@ -1787,6 +1791,8 @@ void map::shoot(game *g, const int x, const int y, int &dam, remove_field(x, y); } break; + default: + break; } // Now, destroy items on that tile. @@ -1817,6 +1823,8 @@ void map::shoot(game *g, const int x, const int y, int &dam, if (i_at(x, y)[i].damage >= 5) destroyed = true; break; + default: + break; } if (destroyed) { for (int j = 0; j < i_at(x, y)[i].contents.size(); j++) @@ -1876,6 +1884,9 @@ bool map::hit_with_acid(game *g, const int x, const int y) case t_card_military: ter(x, y) = t_card_reader_broken; break; + + default: + break; } return true; diff --git a/mapgen.cpp b/mapgen.cpp index 4ef59d8febc63..abaf84c1bcf89 100644 --- a/mapgen.cpp +++ b/mapgen.cpp @@ -329,6 +329,9 @@ void map::draw_map(oter_id terrain_type, oter_id t_north, oter_id t_east, e_fac = 0; s_fac = 0; w_fac = 0; + break; + default: + break; } if (t_north == ot_forest || t_north == ot_forest_water) n_fac += 14; @@ -2998,6 +3001,8 @@ case ot_lmoe: { doorx = rng(bx1 + 1, bx2 - 1); doory = by2; break; + default: + break; } for (int i = doorx - 1; i <= doorx + 1; i++) { for (int j = doory - 1; j <= doory + 1; j++) { @@ -3796,6 +3801,7 @@ case ot_lmoe: { case EAST: p = point(SEEX * 2 - rng(2, 6), rng(1, SEEY * 2 - 2));break; case SOUTH: p = point(rng(1, SEEX * 2 - 2), SEEY * 2 - rng(2, 6));break; case WEST: p = point(rng(1, 5) , rng(1, SEEY * 2 - 2));break; + default: break; } ter(p.x, p.y) = t_rock_floor; add_spawn(mon_dark_wyrm, 1, p.x, p.y); @@ -3871,6 +3877,8 @@ case ot_lmoe: { square(this, t_rock_floor, 6, SEEY - 3, SEEX, SEEY + 2); line(this, t_slope_down, 6, SEEY - 2, 6, SEEY + 1); break; + default: + break; } } } // Done building a slope down @@ -3922,6 +3930,8 @@ case ot_lmoe: { case WEST: line(this, t_slope_up, 6, SEEY - 2, 6, SEEY + 1); break; + default: + break; } } } // Done building a slope up @@ -4023,6 +4033,8 @@ case ot_lmoe: { square(this, t_rock, 0, 0, 4, SEEY * 2 - 1); line(this, t_fault, 4, 4, 4, SEEY * 2 - 5); break; + default: + break; } ter(SEEX, SEEY) = t_console; @@ -6411,6 +6423,8 @@ break; square(this, t_dirt, nodex - 2, nodey + 1, nodex - 1, nodey + 2); node--; break; + default: + break; } } } while (!done); @@ -7891,6 +7905,8 @@ void house_room(map *m, room_type type, int x1, int y1, int x2, int y2) if (!((m->ter(x2-3, y2-2)==t_wall_v)||(m->ter(x2-3, y2-2)==t_wall_h))) { m->ter(x2-3, y2-2) = t_sink; } break; + default: + break; } m->place_items(placed, chance, x1 + 1, y1 + 1, x2 - 1, y2 - 1, false, 0); } @@ -8169,6 +8185,8 @@ void science_room(map *m, int x1, int y1, int x2, int y2, int rotate) science_room(m, x1, w2 + 1, x2, y2, 0); } break; + default: + break; } } @@ -8422,6 +8440,8 @@ void build_mine_room(map *m, room_type type, int x1, int y1, int x2, int y2) door_point.x = x1; door_point.y = midy; break; + default: + break; } square(m, t_floor, x1, y1, x2, y2); line(m, t_wall_h, x1, y1, x2, y1); @@ -8496,6 +8516,9 @@ void build_mine_room(map *m, room_type type, int x1, int y1, int x2, int y2) } m->place_items(mi_bedroom, 65, x1 + 1, y1 + 1, x2 - 1, y2 - 1, false, 0); break; + + default: + break; } if (type == room_mine_fuel) { // Fuel stations are open on one side @@ -8504,6 +8527,7 @@ void build_mine_room(map *m, room_type type, int x1, int y1, int x2, int y2) case EAST: line(m, t_floor, x2, y1 + 1, x2, y2 - 1); break; case SOUTH: line(m, t_floor, x1, y2 , x2, y2 ); break; case WEST: line(m, t_floor, x1, y1 + 1, x1, y2 - 1); break; + default: break; } } else { if (type == room_mine_storage) // Storage has a locked door @@ -8807,6 +8831,9 @@ x: %d - %d, dx: %d cx: %d/%d", x1, x2, dx, cx_low, cx_hi, } } break; + + default: + break; } } @@ -9165,6 +9192,8 @@ void map::add_extra(map_extra type, game *g) add_item(center.x, center.y, g->new_natural_artifact(prop), 0); } break; + default: + break; } // switch (prop) } @@ -9281,6 +9310,8 @@ void map::create_anomaly(int cx, int cy, artifact_natural_property prop) artifact_natural_property(rng(ARTPROP_NULL + 1, ARTPROP_MAX - 1))); break; + default: + break; } } diff --git a/melee.cpp b/melee.cpp index ad0dc2e88cced..85cfa6d3da1fb 100644 --- a/melee.cpp +++ b/melee.cpp @@ -876,6 +876,8 @@ void player::perform_technique(technique_id technique, game *g, monster *z, g->add_msg("%s disarm%s %s!", You.c_str(), s.c_str(), target.c_str()); break; + default: + break; } // switch (tech) } @@ -1039,6 +1041,8 @@ void player::perform_defensive_technique( target.c_str()); break; + default: + break; } // switch (technique) } diff --git a/mission.cpp b/mission.cpp index 6578263c61d9d..0b3620a7a6d32 100644 --- a/mission.cpp +++ b/mission.cpp @@ -100,6 +100,9 @@ There's a town nearby. Check pharmacies; it'll be behind the counter."; return "What?! You're lying, I can tell! Ugh, forget it!"; case TALK_MISSION_FAILURE: return "How am I not dead already?!"; + + default: + break; } break; @@ -124,6 +127,8 @@ Thanks! Just pull the data onto this USB drive and bring it to me."; return "What?! You liar!"; case TALK_MISSION_FAILURE: return "Wow, you failed? All that work, down the drain..."; + default: + break; } break; @@ -155,6 +160,8 @@ computers before completing that part."; return "Wait, you couldn't possibly have the data! Liar!"; case TALK_MISSION_FAILURE: return "What a shame, that data could have proved invaluable..."; + default: + break; } break; @@ -194,6 +201,8 @@ Thank you so much for finding him!"; case TALK_MISSION_FAILURE: return "Oh no! My poor puppy..."; + default: + break; } break; @@ -219,6 +228,9 @@ of those things now. Can you put her out of her misery for me?"; return "What?! You're lying, I can tell! Ugh, forget it!"; case TALK_MISSION_FAILURE: return "Really... that's too bad."; + + default: + break; } break; default: @@ -233,6 +245,9 @@ of those things now. Can you put her out of her misery for me?"; case TALK_MISSION_SUCCESS_LIE: case TALK_MISSION_FAILURE: return "Someone forgot to code this message!"; + + default: + break; } break; } diff --git a/mission.h b/mission.h index 1ddef562c864b..66e0a6388a1db 100644 --- a/mission.h +++ b/mission.h @@ -47,8 +47,8 @@ enum mission_goal { }; struct mission_place { // Return true if [posx,posy] is valid in overmap - bool never (game */*g*/, int /*posx*/, int /*posy*/) { return false; } - bool always (game */*g*/, int /*posx*/, int /*posy*/) { return true; } + bool never (game * /*g*/, int /*posx*/, int /*posy*/) { return false; } + bool always (game * /*g*/, int /*posx*/, int /*posy*/) { return true; } bool near_town (game *g, int posx, int posy); }; diff --git a/mission_start.cpp b/mission_start.cpp index 3ba0dbf0105a1..30474acd7cba4 100644 --- a/mission_start.cpp +++ b/mission_start.cpp @@ -186,6 +186,9 @@ void mission_start::place_npc_software(game *g, mission *miss) } } } break; + + default: + break; } std::stringstream compname; diff --git a/monattack.cpp b/monattack.cpp index 90d0e158928fa..5d4c67fa6ddcc 100644 --- a/monattack.cpp +++ b/monattack.cpp @@ -963,6 +963,7 @@ void mattack::vortex(game *g, monster *z) case IRON: distance -= 1; // fall through case STEEL: case SILVER: distance -= 3; damage -= 10; break; + default: break; } if (distance > 0) { if (g->u_see(thrown, t)) diff --git a/monattack.h b/monattack.h index 754d90c9a9bba..545864063c1db 100644 --- a/monattack.h +++ b/monattack.h @@ -8,7 +8,7 @@ class game; class mattack { public: - void none (game */*g*/, monster */*z*/) { }; + void none (game * /*g*/, monster * /*z*/) { }; void antqueen (game *g, monster *z); void shriek (game *g, monster *z); void acid (game *g, monster *z); diff --git a/monster.cpp b/monster.cpp index 31e9f41b79564..e782bce5faf3c 100644 --- a/monster.cpp +++ b/monster.cpp @@ -133,6 +133,7 @@ std::string monster::name_with_armor() case FLESH: ret += "'s thick hide"; break; case IRON: case STEEL: ret += "'s armor plating"; break; + default: break; } } return ret; @@ -535,6 +536,7 @@ void monster::hit_monster(game *g, int i) case MS_SMALL: dodgedice += 3; break; case MS_LARGE: dodgedice -= 2; break; case MS_HUGE: dodgedice -= 4; break; + default: break; } if (dice(numdice, 10) <= dice(dodgedice, 10)) { @@ -592,6 +594,7 @@ int monster::dodge_roll() case MS_SMALL: numdice += 3; break; case MS_LARGE: numdice -= 2; break; case MS_HUGE: numdice -= 4; break; + default: break; } numdice += int(speed / 80); @@ -771,6 +774,8 @@ void monster::process_effects(game *g) hurt(rng(15, 40)); break; + default: + break; } if (effects[i].duration > 0) { effects[i].duration--; diff --git a/mtypedef.cpp b/mtypedef.cpp index f0940c82257b1..33082f67fb27e 100644 --- a/mtypedef.cpp +++ b/mtypedef.cpp @@ -1233,6 +1233,8 @@ std::vector default_anger(monster_species spec) break; case species_hallu: break; + default: + break; } return ret; } @@ -1266,6 +1268,8 @@ std::vector default_fears(monster_species spec) break; case species_hallu: break; + default: + break; } return ret; } diff --git a/mutation.cpp b/mutation.cpp index b81ee499993bf..c3f5f6a863dff 100644 --- a/mutation.cpp +++ b/mutation.cpp @@ -317,6 +317,9 @@ void mutation_effect(game *g, player &p, pl_flag mut) case PF_PER_UP_4: p.per_max += 3; break; + + default: + break; } for (int i = 0; i < p.worn.size(); i++) { @@ -391,5 +394,8 @@ void mutation_loss_effect(game *g, player &p, pl_flag mut) case PF_PER_UP_4: p.per_max -= 4; break; + + default: + break; } } diff --git a/mutation_data.cpp b/mutation_data.cpp index 34976ae628e8b..b8c61a888e7f6 100644 --- a/mutation_data.cpp +++ b/mutation_data.cpp @@ -601,6 +601,8 @@ PF_DISRESISTANT, PF_NIGHTVISION2, PF_FANGS, PF_FUR, PF_CLAWS, PF_TAIL_LONG, PF_WHISKERS, PF_DEFORMED3, PF_VOMITOUS, PF_HUNGER, PF_TROGLO2, PF_GROWL, NULL); break; + default: + break; } return ret; diff --git a/newcharacter.cpp b/newcharacter.cpp index 8cc4ae4527077..1c4c37c0d6d41 100644 --- a/newcharacter.cpp +++ b/newcharacter.cpp @@ -145,6 +145,9 @@ bool player::create(game *g, character_type type, std::string tempname) load_info(g, data); points = 0; } break; + + default: + break; } tab = 3; } else diff --git a/npc.cpp b/npc.cpp index 4c10e89c4182b..5b3bed6314ed2 100644 --- a/npc.cpp +++ b/npc.cpp @@ -455,6 +455,9 @@ void npc::randomize(game *g, npc_class type) personality.aggression += rng(1, 6); personality.bravery += rng(0, 5); break; + + default: + break; } for (int i = 0; i < num_hp_parts; i++) { hp_max[i] = 60 + str_max * 3; @@ -526,6 +529,9 @@ void npc::randomize_from_faction(game *g, faction *fac) personality.altruism += rng(1, 5); personality.collector += rng(1, 5); break; + + default: + break; } // Jobs if (fac->has_job(FACJOB_EXTORTION)) { @@ -831,6 +837,9 @@ std::vector starting_clothes(npc_class type, bool male, game *g) hat = itm_helmet_motor; } break; + + default: + break; } // Fill in the standard things we wear if (shoes != itm_null) @@ -868,6 +877,8 @@ std::vector starting_clothes(npc_class type, bool male, game *g) if (!one_in(15)) ret.push_back(item(g->itypes[itm_backpack], 0)); break; + default: + break; } return ret; @@ -1042,6 +1053,9 @@ void npc::starting_weapon(game *g) index = rng(0, g->mapitems[mi_rifles].size() - 1); weapon.make(g->itypes[(g->mapitems[mi_rifles])[index]]); break; + + default: + break; } if (weapon.is_gun()) { it_gun* gun = dynamic_cast(weapon.type); @@ -2037,6 +2051,8 @@ std::string npc_class_name(npc_class classtype) return "Scientist"; case NC_BOUNTY_HUNTER: // Resourceful and well-armored return "Bounty Hunter"; + default: + break; } return "Unknown class"; } diff --git a/npcmove.cpp b/npcmove.cpp index 86404b3a3e23f..658d3b56852ae 100644 --- a/npcmove.cpp +++ b/npcmove.cpp @@ -368,6 +368,8 @@ void npc::choose_monster_target(game *g, int &enemy, int &danger, case ENGAGE_HIT: okay_by_rules = (mon->has_effect(ME_HIT_BY_PLAYER)); break; + default: + break; } } diff --git a/npctalk.cpp b/npctalk.cpp index cce4a15ccb7ec..7a4b647d59379 100644 --- a/npctalk.cpp +++ b/npctalk.cpp @@ -430,6 +430,8 @@ std::string dynamic_line(talk_topic topic, game *g, npc *p) return opinion.str(); } break; + default: + break; } return "I don't know what to say. (BUG)"; @@ -1110,6 +1112,9 @@ std::vector gen_responses(talk_topic topic, game *g, npc *p) RESPONSE("Okay."); SUCCESS(TALK_NONE); break; + + default: + break; } if (ret.empty()) { @@ -1153,6 +1158,8 @@ int trial_chance(talk_response response, player *u, npc *p) chance += 30; break; + default: + break; } if (chance < 0) diff --git a/omdata.h b/omdata.h index 4b2c416f194af..030fada7c04b4 100644 --- a/omdata.h +++ b/omdata.h @@ -379,8 +379,8 @@ NUM_OMS_FLAGS struct omspec_place { // Able functions - true if p is valid - bool never (overmap */*om*/, point /*p*/) { return false; } - bool always (overmap */*om*/, point /*p*/) { return true; } + bool never (overmap * /*om*/, point /*p*/) { return false; } + bool always (overmap * /*om*/, point /*p*/) { return true; } bool water (overmap *om, point p); // Only on rivers bool land (overmap *om, point p); // Only on land (no rivers) bool forest (overmap *om, point p); // Forest diff --git a/output.cpp b/output.cpp index fffe57206de51..4f5d06346a7df 100644 --- a/output.cpp +++ b/output.cpp @@ -44,6 +44,7 @@ nc_color hilite(nc_color c) case c_ltcyan: return h_ltcyan; case c_pink: return h_pink; case c_yellow: return h_yellow; + default: break; } return h_white; } @@ -67,6 +68,7 @@ nc_color invert_color(nc_color c) case c_pink: return i_magenta; case c_brown: case c_yellow: return i_brown; + default: break; } } switch (c) { @@ -85,6 +87,7 @@ nc_color invert_color(nc_color c) case c_ltblue: return i_ltblue; case c_ltcyan: return i_ltcyan; case c_pink: return i_pink; + default: break; } return c_pink; @@ -108,6 +111,7 @@ nc_color red_background(nc_color c) case c_ltcyan: return c_ltcyan_red; case c_pink: return c_pink_red; case c_yellow: return c_yellow_red; + default: break; } return c_white_red; } @@ -125,6 +129,7 @@ nc_color rand_color() case 7: return c_pink; case 8: return c_magenta; case 9: return c_brown; + default: break; } return c_dkgray; } diff --git a/overmap.cpp b/overmap.cpp index 53e337f0c3c81..ee2dd0a9fa3db 100644 --- a/overmap.cpp +++ b/overmap.cpp @@ -2393,6 +2393,9 @@ void overmap::place_radios() This is FEMA camp %d%d. A desginated long-term emergency shelter.", i, j, i, j); radios.push_back(radio_tower(i*2, j*2, rng(80, 200), message)); break; + + default: + break; } } } diff --git a/player.cpp b/player.cpp index 839c1c406559e..3b60d6f679529 100644 --- a/player.cpp +++ b/player.cpp @@ -362,6 +362,8 @@ void player::temp_equalizer(body_part bp1, body_part bp2) case bp_legs: temp_cur[bp1] -= temp_diff*0.05; temp_cur[bp2] += temp_diff*0.05; + default: + break; } } @@ -4694,6 +4696,7 @@ int player::encumb(body_part bp, int &layers, int &armorenc, int &warmth) case bp_legs : if (!is_wearing(itm_long_underpants)) break; else layers--; case bp_hands : if (!is_wearing(itm_gloves_liner)) break; else layers--; case bp_torso : if (!is_wearing(itm_under_armor)) break; else layers--; + default: break; } if (layers > 1) ret += (layers - 1) * (bp == bp_torso ? .5 : 2);// Easier to layer on torso diff --git a/settlement.h b/settlement.h index 295d1e8e740a6..ee5f69246b89a 100644 --- a/settlement.h +++ b/settlement.h @@ -11,7 +11,7 @@ struct settlement { settlement(int mapx, int mapy); void pick_faction(game *g, int omx, int omy); void set_population(); - void populate(game */*g*/) { }; + void populate(game * /*g*/) { }; int num(oter_id ter); void add_building(oter_id ter); diff --git a/trap.h b/trap.h index ae374bb7214db..8a1752dc9d160 100644 --- a/trap.h +++ b/trap.h @@ -46,10 +46,10 @@ enum trap_id { struct trap; struct trapfunc { - void none (game */*g*/, int /*x*/, int /*y*/) { }; + void none (game * /*g*/, int /*x*/, int /*y*/) { }; void bubble (game *g, int x, int y); void beartrap (game *g, int x, int y); - void snare (game */*g*/, int /*x*/, int /*y*/) { }; + void snare (game * /*g*/, int /*x*/, int /*y*/) { }; void board (game *g, int x, int y); void tripwire (game *g, int x, int y); void crossbow (game *g, int x, int y); @@ -63,7 +63,7 @@ struct trapfunc { void pit (game *g, int x, int y); void pit_spikes (game *g, int x, int y); void lava (game *g, int x, int y); - void portal (game */*g*/, int /*x*/, int /*y*/) { }; + void portal (game * /*g*/, int /*x*/, int /*y*/) { }; void ledge (game *g, int x, int y); void boobytrap (game *g, int x, int y); void temple_flood (game *g, int x, int y); @@ -76,7 +76,7 @@ struct trapfunc { }; struct trapfuncm { - void none (game */*g*/, monster */*z*/, int /*x*/, int /*y*/) { }; + void none (game * /*g*/, monster * /*z*/, int /*x*/, int /*y*/) { }; void bubble (game *g, monster *z, int x, int y); void cot (game *g, monster *z, int x, int y); void beartrap (game *g, monster *z, int x, int y); @@ -85,16 +85,16 @@ struct trapfuncm { void crossbow (game *g, monster *z, int x, int y); void shotgun (game *g, monster *z, int x, int y); void blade (game *g, monster *z, int x, int y); - void snare (game */*g*/, monster */*z*/, int /*x*/, int /*y*/) { }; + void snare (game * /*g*/, monster * /*z*/, int /*x*/, int /*y*/) { }; void landmine (game *g, monster *z, int x, int y); void telepad (game *g, monster *z, int x, int y); void goo (game *g, monster *z, int x, int y); void dissector (game *g, monster *z, int x, int y); - void sinkhole (game */*g*/, monster */*z*/, int /*x*/, int /*y*/) { }; + void sinkhole (game * /*g*/, monster * /*z*/, int /*x*/, int /*y*/) { }; void pit (game *g, monster *z, int x, int y); void pit_spikes(game *g, monster *z, int x, int y); void lava (game *g, monster *z, int x, int y); - void portal (game */*g*/, monster */*z*/, int /*x*/, int /*y*/) { }; + void portal (game * /*g*/, monster * /*z*/, int /*x*/, int /*y*/) { }; void ledge (game *g, monster *z, int x, int y); void boobytrap (game *g, monster *z, int x, int y); void glow (game *g, monster *z, int x, int y); diff --git a/trapfunc.cpp b/trapfunc.cpp index 4be5fb0a90c07..102883c07a563 100644 --- a/trapfunc.cpp +++ b/trapfunc.cpp @@ -582,6 +582,8 @@ void trapfunc::temple_toggle(game *g, int x, int y) g->m.ter(i, j) = t_rock_red; break; + default: + break; } } } diff --git a/tutorial.cpp b/tutorial.cpp index e064c4d2bae95..5ef2180c38e22 100644 --- a/tutorial.cpp +++ b/tutorial.cpp @@ -199,6 +199,8 @@ void tutorial_game::post_action(game *g, action_id act) add_message(g, LESSON_OVERLOADED); } break; + default: + break; } } @@ -211,6 +213,7 @@ void tutorial_game::add_message(game *g, tut_lesson lesson) case LESSON_INTRO: lesson = LESSON_MOVE; break; case LESSON_MOVE: lesson = LESSON_LOOK; break; case LESSON_LOOK: lesson = NUM_LESSONS; break; + default: break; } } if (lesson == NUM_LESSONS) From e19854dc3e42b71779da5adf73e2f380d66021ea Mon Sep 17 00:00:00 2001 From: AkrionXxarr Date: Wed, 27 Feb 2013 19:45:47 -0800 Subject: [PATCH 5/6] Further warning resolutions. Specifically focused on unused parameter warnings. Small error fixes. Further warning resolutions. A fix in items.h. Further warning resolutions. A few bug fixes and fixes to past changes. Small error fixes. --- dialogue.h | 4 +- game.cpp | 58 +++++++------ graffiti.cpp | 1 + inventory_ui.cpp | 8 +- item.cpp | 13 +-- item.h | 2 +- iuse.cpp | 210 +++++++++++++++++++++++----------------------- map.cpp | 23 ++--- mapbuffer.cpp | 2 +- mapgen.cpp | 25 +++--- melee.cpp | 10 ++- mission_start.cpp | 4 +- monattack.cpp | 4 +- mondeath.cpp | 8 +- monmove.cpp | 8 +- monster.cpp | 2 +- mutation.cpp | 5 +- npc.cpp | 6 +- npcmove.cpp | 18 ++-- npctalk.cpp | 42 +++++----- output.cpp | 2 +- overmap.cpp | 10 +-- player.cpp | 4 +- player.h | 4 +- rng.cpp | 2 +- settlement.cpp | 4 +- texthash.cpp | 2 +- tileray.cpp | 4 +- trapfunc.cpp | 36 ++++---- tutorial.cpp | 2 +- veh_interact.cpp | 2 +- vehicle.cpp | 6 +- vehicle.h | 2 +- weather.cpp | 2 +- wish.cpp | 12 +-- 35 files changed, 282 insertions(+), 265 deletions(-) diff --git a/dialogue.h b/dialogue.h index e9fd0067f10cd..14fc136fadeb9 100644 --- a/dialogue.h +++ b/dialogue.h @@ -29,7 +29,7 @@ struct dialogue { struct talk_function { - void nothing (game *g, npc *p) {}; + void nothing (game * /*g*/, npc * /*p*/) {}; void assign_mission (game *g, npc *p); void mission_success (game *g, npc *p); void mission_failure (game *g, npc *p); @@ -42,7 +42,7 @@ struct talk_function void deny_follow (game *g, npc *p); // p gets DI_ASKED_TO_FOLLOW void deny_lead (game *g, npc *p); // p gets DI_ASKED_TO_LEAD void deny_equipment (game *g, npc *p); // p gets DI_ASKED_FOR_ITEM - void enslave (game *g, npc *p) {}; // p becomes slave of u + void enslave (game * /*g*/, npc * /*p*/) {}; // p becomes slave of u void hostile (game *g, npc *p); // p turns hostile to u void flee (game *g, npc *p); void leave (game *g, npc *p); // p becomes indifferant diff --git a/game.cpp b/game.cpp index ab18937be6a6c..7bd6d4cc32850 100644 --- a/game.cpp +++ b/game.cpp @@ -214,7 +214,7 @@ Please report bugs to TheDarklingWolf@gmail.com or post on the forums."); templates.push_back(tmp.substr(0, tmp.find(".template"))); } int sel1 = 0, sel2 = 1, layer = 1; - char ch; + char ch = 0; bool start = false; // Load MOTD and store it in a string @@ -3120,7 +3120,7 @@ unsigned char game::light_level() ret = 8; if (ret < 8 && event_queued(EVENT_ARTIFACT_LIGHT)) ret = 8; - if (ret < 6 && u.has_amount(itm_torch_lit, 1) || ret < 6 && u.has_amount(itm_pda_flashlight, 1)) + if ((ret < 6 && u.has_amount(itm_torch_lit, 1)) || (ret < 6 && u.has_amount(itm_pda_flashlight, 1))) ret = 6; if (ret < 4 && u.has_artifact_with(AEP_GLOW)) ret = 4; @@ -4199,7 +4199,7 @@ void game::explode_mon(int index) // Send body parts and blood all over! mtype* corpse = z[index].type; if (corpse->mat == FLESH || corpse->mat == VEGGY) { // No chunks otherwise - int num_chunks; + int num_chunks = 0; switch (corpse->size) { case MS_TINY: num_chunks = 1; break; case MS_SMALL: num_chunks = 2; break; @@ -4961,8 +4961,8 @@ void game::examine() }} else { add_msg("You need a shovel to do that!"); } - } else if (m.ter(examx, examy) == t_chainfence_v && query_yn("Climb fence?") || - m.ter(examx, examy) == t_chainfence_h && query_yn("Climb fence?")) { + } else if ((m.ter(examx, examy) == t_chainfence_v && query_yn("Climb fence?")) || + (m.ter(examx, examy) == t_chainfence_h && query_yn("Climb fence?"))) { u.moves -= 400; if (one_in(u.dex_cur)) { add_msg("You slip whilst climbing and fall down again"); @@ -5397,19 +5397,21 @@ point game::look_around() if (dex != -1 && u_see(&(z[dex]), junk)) { z[mon_at(lx, ly)].draw(w_terrain, lx, ly, true); z[mon_at(lx, ly)].print_info(this, w_look); - if (!m.has_flag(container, lx, ly)) + if (!m.has_flag(container, lx, ly)){ if (m.i_at(lx, ly).size() > 1) mvwprintw(w_look, 3, 1, "There are several items there."); else if (m.i_at(lx, ly).size() == 1) mvwprintw(w_look, 3, 1, "There is an item there."); + } } else if (npc_at(lx, ly) != -1) { active_npc[npc_at(lx, ly)].draw(w_terrain, lx, ly, true); active_npc[npc_at(lx, ly)].print_info(w_look); - if (!m.has_flag(container, lx, ly)) + if (!m.has_flag(container, lx, ly)){ if (m.i_at(lx, ly).size() > 1) mvwprintw(w_look, 3, 1, "There are several items there."); else if (m.i_at(lx, ly).size() == 1) mvwprintw(w_look, 3, 1, "There is an item there."); + } } else if (veh) { mvwprintw(w_look, 3, 1, "There is a %s there. Parts:", veh->name.c_str()); veh->print_part_desc(w_look, 4, 48, veh_part); @@ -5842,22 +5844,22 @@ void game::pickup(int posx, int posy, int min) } if (ch >= 'a' && ch <= 'a' + here.size() - 1) { ch -= 'a'; - getitem[ch] = !getitem[ch]; + getitem[unsigned(ch)] = !getitem[unsigned(ch)]; wclear(w_item_info); - if (getitem[ch]) { - mvwprintw(w_item_info, 1, 0, here[ch].info().c_str()); + if (getitem[unsigned(ch)]) { + mvwprintw(w_item_info, 1, 0, here[unsigned(ch)].info().c_str()); wborder(w_item_info, LINE_XOXO, LINE_XOXO, LINE_OXOX, LINE_OXOX, LINE_OXXO, LINE_OOXX, LINE_XXOO, LINE_XOOX ); wrefresh(w_item_info); - new_weight += here[ch].weight(); - new_volume += here[ch].volume(); + new_weight += here[unsigned(ch)].weight(); + new_volume += here[unsigned(ch)].volume(); update = true; } else { wborder(w_item_info, LINE_XOXO, LINE_XOXO, LINE_OXOX, LINE_OXOX, LINE_OXXO, LINE_OOXX, LINE_XXOO, LINE_XOOX ); wrefresh(w_item_info); - new_weight -= here[ch].weight(); - new_volume -= here[ch].volume(); + new_weight -= here[unsigned(ch)].weight(); + new_volume -= here[unsigned(ch)].volume(); update = true; } } @@ -6641,7 +6643,7 @@ void game::butcher() for (int i = corpses.size() - 1; i >= 0; i--) { mtype *corpse = m.i_at(u.posx, u.posy)[corpses[i]].corpse; if (query_yn("Butcher the %s corpse?", corpse->name.c_str())) { - int time_to_cut; + int time_to_cut = 0; switch (corpse->size) { // Time in turns to cut up te corpse case MS_TINY: time_to_cut = 2; break; case MS_SMALL: time_to_cut = 5; break; @@ -6666,7 +6668,7 @@ void game::complete_butcher(int index) int age = m.i_at(u.posx, u.posy)[index].bday; m.i_rem(u.posx, u.posy, index); int factor = u.butcher_factor(); - int pieces, pelts; + int pieces = 0, pelts = 0; double skill_shift = 0.; int sSkillLevel = u.skillLevel("survival").level(); @@ -6815,11 +6817,11 @@ single action.", u.weapon.tname().c_str()); if (u.weapon.charges == u.weapon.clip_size()) { int alternate_magazine = -1; for (int i = 0; i < u.weapon.contents.size(); i++) { - if (u.weapon.contents[i].is_gunmod() && + if ((u.weapon.contents[i].is_gunmod() && (u.weapon.contents[i].typeId() == itm_spare_mag && - u.weapon.contents[i].charges < (dynamic_cast(u.weapon.type))->clip) || - (u.weapon.contents[i].has_flag(IF_MODE_AUX) && - u.weapon.contents[i].charges < u.weapon.contents[i].clip_size())) + u.weapon.contents[i].charges < (dynamic_cast(u.weapon.type))->clip)) || + ((u.weapon.contents[i].has_flag(IF_MODE_AUX) && + u.weapon.contents[i].charges < u.weapon.contents[i].clip_size()))) alternate_magazine = i; } if(alternate_magazine == -1) { @@ -6872,7 +6874,7 @@ void game::unload() has_m203 = u.weapon.has_gunmod (itm_m203); has_shotgun = u.weapon.has_gunmod (itm_u_shotgun); } - if (u.weapon.is_container() || u.weapon.charges == 0 && + if ((u.weapon.is_container() || u.weapon.charges == 0) && (spare_mag == -1 || u.weapon.contents[spare_mag].charges <= 0) && (has_m203 == -1 || u.weapon.contents[has_m203].charges <= 0) && (has_shotgun == -1 || u.weapon.contents[has_shotgun].charges <= 0)) { @@ -7550,16 +7552,22 @@ void game::fling_player_or_monster(player *p, monster *zz, int dir, int flvel) p->hitall (this, dam1, 40); } else + { zz->hurt (dam1); + } if (is_u) + { if (dam1 > 0) add_msg ("You fall on the ground for %d damage.", dam1); else add_msg ("You fall on the ground."); + } } else - if (is_u) - add_msg ("You fall into water."); + { + if (is_u) + add_msg ("You fall into water."); + } } void game::vertical_move(int movez, bool force) @@ -8232,7 +8240,7 @@ void game::wait() { char ch = menu("Wait for how long?", "5 Minutes", "30 Minutes", "1 hour", "2 hours", "3 hours", "6 hours", "Exit", NULL); - int time; + int time = 0; if (ch == 7) return; switch (ch) { @@ -8561,7 +8569,7 @@ int game::autosave_timeout() void game::autosave() { - if (u.in_vehicle || !moves_since_last_save && !item_exchanges_since_save) + if ((u.in_vehicle || !moves_since_last_save) && !item_exchanges_since_save) return; add_msg("Saving game, this may take a while"); save(); diff --git a/graffiti.cpp b/graffiti.cpp index 4193ca560d775..fa413040509c4 100644 --- a/graffiti.cpp +++ b/graffiti.cpp @@ -22,4 +22,5 @@ graffiti graffiti::operator=(graffiti rhs) this->contents = new std::string(*rhs.contents); else this->contents = 0; + // This should return something } \ No newline at end of file diff --git a/inventory_ui.cpp b/inventory_ui.cpp index 20aa1b19aceab..30fdf9dea8728 100644 --- a/inventory_ui.cpp +++ b/inventory_ui.cpp @@ -183,7 +183,7 @@ char game::inv_type(std::string title, int inv_item_type) WINDOW* w_inv = newwin(((VIEWY < 12) ? 25 : VIEWY*2+1), ((VIEWX < 12) ? 80 : VIEWX*2+56), 0, 0); const int maxitems = (VIEWY < 12) ? 20 : VIEWY*2-4; // Number of items to show at one time. char ch = '.'; - int start = 0, cur_it; + int start = 0, cur_it = 0; u.sort_inv(); u.inv.restack(&u); std::vector null_vector; @@ -314,7 +314,7 @@ std::vector game::multidrop() std::vector firsts = find_firsts(u.inv); char ch = '.'; - int start = 0, cur_it; + int start = 0, cur_it = 0; do { if (ch == '<' && start > 0) { for (int i = 1; i < maxitems+4; i++) @@ -523,7 +523,7 @@ void game::compare(int iCompareX, int iCompareY) int compare[u.inv.size() + groundsize]; // Count of how many we'll drop from each stack bool bFirst = false; // First Item selected bool bShowCompare = false; - char cLastCh; + char cLastCh = 0; for (int i = 0; i < u.inv.size() + groundsize; i++) compare[i] = 0; std::vector weapon_and_armor; // Always single, not counted @@ -538,7 +538,7 @@ void game::compare(int iCompareX, int iCompareY) firsts.push_back((first[i] >= 0) ? first[i]+groundsize : -1); } ch = '.'; - int start = 0, cur_it; + int start = 0, cur_it = (0); do { if (ch == '<' && start > 0) { for (int i = 1; i < maxitems+4; i++) diff --git a/item.cpp b/item.cpp index 9a5c8935f63ce..ba95a1bf7be7d 100644 --- a/item.cpp +++ b/item.cpp @@ -409,11 +409,11 @@ std::string item::info(bool showtext, std::vector *dump) } else if (is_gun()) { it_gun* gun = dynamic_cast(type); - int ammo_dam = 0, ammo_recoil = 0; + int ammo_dam = 0; //ammo_recoil = 0; bool has_ammo = (curammo != NULL && charges > 0); if (has_ammo) { ammo_dam = curammo->damage; - ammo_recoil = curammo->recoil; + //ammo_recoil = curammo->recoil; } dump->push_back(iteminfo("GUN", " Skill used: ", gun->skill_used->name())); @@ -676,7 +676,7 @@ nc_color item::color(player *u) return ret; } -nc_color item::color_in_inventory(player *u) +nc_color item::color_in_inventory(player * /*u*/) { // Items in our inventory get colorized specially nc_color ret = c_white; @@ -832,7 +832,7 @@ int item::price() int item::weight() { if (typeId() == itm_corpse) { - int ret; + int ret = 0; switch (corpse->size) { case MS_TINY: ret = 5; break; case MS_SMALL: ret = 60; break; @@ -1808,17 +1808,18 @@ bool item::reload(player &u, int index) reload_target->charges = max_load; } } - if (ammo_to_use->charges == 0) + if (ammo_to_use->charges == 0){ if (u.inv[index].is_container()) u.inv[index].contents.erase(u.inv[index].contents.begin()); else u.i_remn(index); + } return true; } else return false; } -void item::use(player &u) +void item::use(player & /*u*/) { if (charges > 0) charges--; diff --git a/item.h b/item.h index 12fcb856ff408..23125a3bfc9d2 100644 --- a/item.h +++ b/item.h @@ -141,7 +141,7 @@ class item std::string name; char invlet; // Inventory letter - unsigned int charges; + int charges; bool active; // If true, it has active effects to be processed signed char damage; // How much damage it's sustained; generally, max is 5 char burnt; // How badly we're burnt diff --git a/iuse.cpp b/iuse.cpp index 40588450c729c..4a2f77ee7cb92 100644 --- a/iuse.cpp +++ b/iuse.cpp @@ -33,17 +33,17 @@ static void add_or_drop_item(game *g, player *p, item *it) /* To mark an item as "removed from inventory", set its invlet to 0 This is useful for traps (placed on ground), inactive bots, etc */ -void iuse::sewage(game *g, player *p, item *it, bool t) +void iuse::sewage(game *g, player *p, item * /*it*/, bool /*t*/) { p->vomit(g); if (one_in(4)) p->mutate(g); } -void iuse::honeycomb(game *g, player *p, item *it, bool t) +void iuse::honeycomb(game *g, player *p, item * /*it*/, bool /*t*/) { g->m.add_item(p->posx, p->posy, g->itypes[itm_wax],0, 2); } -void iuse::royal_jelly(game *g, player *p, item *it, bool t) +void iuse::royal_jelly(game *g, player *p, item * /*it*/, bool /*t*/) { // TODO: Add other diseases here; royal jelly is a cure-all! p->pkill += 5; @@ -75,10 +75,10 @@ void iuse::royal_jelly(game *g, player *p, item *it, bool t) g->add_msg_if_player(p,message.c_str()); } -void iuse::bandage(game *g, player *p, item *it, bool t) +void iuse::bandage(game *g, player *p, item *it, bool /*t*/) { int bonus = p->skillLevel("firstaid").level(); - hp_part healed; + hp_part healed = hp_part(0); if (p->is_npc()) { // NPCs heal whichever has sustained the most damage int highest_damage = 0; @@ -208,10 +208,10 @@ void iuse::bandage(game *g, player *p, item *it, bool t) p->heal(healed, dam); } -void iuse::firstaid(game *g, player *p, item *it, bool t) +void iuse::firstaid(game *g, player *p, item *it, bool /*t*/) { int bonus = p->skillLevel("firstaid").level(); - hp_part healed; + hp_part healed = hp_part(0); if (p->is_npc()) { // NPCs heal whichever has sustained the most damage int highest_damage = 0; @@ -336,7 +336,7 @@ void iuse::firstaid(game *g, player *p, item *it, bool t) } // Aspirin -void iuse::pkill_1(game *g, player *p, item *it, bool t) +void iuse::pkill_1(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You take some %s.", it->tname().c_str()); @@ -353,14 +353,14 @@ void iuse::pkill_1(game *g, player *p, item *it, bool t) } // Codeine -void iuse::pkill_2(game *g, player *p, item *it, bool t) +void iuse::pkill_2(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You take some %s.", it->tname().c_str()); p->add_disease(DI_PKILL2, 180, g); } -void iuse::pkill_3(game *g, player *p, item *it, bool t) +void iuse::pkill_3(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You take some %s.", it->tname().c_str()); @@ -368,7 +368,7 @@ void iuse::pkill_3(game *g, player *p, item *it, bool t) p->add_disease(DI_PKILL2, 200, g); } -void iuse::pkill_4(game *g, player *p, item *it, bool t) +void iuse::pkill_4(game *g, player *p, item * /*it*/, bool /*t*/) { g->add_msg_if_player(p,"You shoot up."); @@ -376,14 +376,14 @@ void iuse::pkill_4(game *g, player *p, item *it, bool t) p->add_disease(DI_PKILL2, 200, g); } -void iuse::pkill_l(game *g, player *p, item *it, bool t) +void iuse::pkill_l(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You take some %s.", it->tname().c_str()); p->add_disease(DI_PKILL_L, rng(12, 18) * 300, g); } -void iuse::xanax(game *g, player *p, item *it, bool t) +void iuse::xanax(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You take some %s.", it->tname().c_str()); @@ -393,13 +393,13 @@ void iuse::xanax(game *g, player *p, item *it, bool t) p->add_disease(DI_TOOK_XANAX, 200, g); } -void iuse::caff(game *g, player *p, item *it, bool t) +void iuse::caff(game * /*g*/, player *p, item *it, bool /*t*/) { it_comest *food = dynamic_cast (it->type); p->fatigue -= food->stim * 3; } -void iuse::alcohol(game *g, player *p, item *it, bool t) +void iuse::alcohol(game *g, player *p, item * /*it*/, bool /*t*/) { int duration = 680 - (10 * p->str_max); // Weaker characters are cheap drunks if (p->has_trait(PF_LIGHTWEIGHT)) @@ -408,7 +408,7 @@ void iuse::alcohol(game *g, player *p, item *it, bool t) p->add_disease(DI_DRUNK, duration, g); } -void iuse::cig(game *g, player *p, item *it, bool t) +void iuse::cig(game *g, player *p, item * /*it*/, bool /*t*/) { if (it->type->id == itm_cig) g->add_msg_if_player(p,"You light a cigarette and smoke it."); @@ -422,7 +422,7 @@ void iuse::cig(game *g, player *p, item *it, bool t) } } -void iuse::weed(game *g, player *p, item *it, bool t) +void iuse::weed(game *g, player *p, item * /*it*/, bool /*t*/) { g->add_msg_if_player(p,"Good stuff, man!"); @@ -435,7 +435,7 @@ void iuse::weed(game *g, player *p, item *it, bool t) p->add_disease(DI_HIGH, duration, g); } -void iuse::coke(game *g, player *p, item *it, bool t) +void iuse::coke(game *g, player *p, item * /*it*/, bool /*t*/) { g->add_msg_if_player(p,"You snort a bump."); @@ -446,7 +446,7 @@ void iuse::coke(game *g, player *p, item *it, bool t) p->add_disease(DI_HIGH, duration, g); } -void iuse::crack(game *g, player *p, item *it, bool t) +void iuse::crack(game *g, player *p, item * /*it*/, bool /*t*/) { g->add_msg_if_player(p,"You smoke some rocks."); p->use_charges(itm_lighter, 1); @@ -457,7 +457,7 @@ void iuse::crack(game *g, player *p, item *it, bool t) p->add_disease(DI_HIGH, duration, g); } -void iuse::grack(game *g, player *p, item *it, bool t) +void iuse::grack(game *g, player *p, item * /*it*/, bool /*t*/) { g->add_msg_if_player(p,"You smoke some Grack Cocaine, time seems to stop."); p->use_charges(itm_lighter, 1); @@ -469,7 +469,7 @@ void iuse::grack(game *g, player *p, item *it, bool t) } -void iuse::meth(game *g, player *p, item *it, bool t) +void iuse::meth(game *g, player *p, item * /*it*/, bool /*t*/) { int duration = 10 * (40 - p->str_cur); if (p->has_amount(itm_apparatus, 1)) { @@ -485,18 +485,18 @@ void iuse::meth(game *g, player *p, item *it, bool t) p->add_disease(DI_METH, duration, g); } -void iuse::poison(game *g, player *p, item *it, bool t) +void iuse::poison(game *g, player *p, item * /*it*/, bool /*t*/) { p->add_disease(DI_POISON, 600, g); p->add_disease(DI_FOODPOISON, 1800, g); } -void iuse::hallu(game *g, player *p, item *it, bool t) +void iuse::hallu(game *g, player *p, item * /*it*/, bool /*t*/) { p->add_disease(DI_HALLU, 2400, g); } -void iuse::thorazine(game *g, player *p, item *it, bool t) +void iuse::thorazine(game *g, player *p, item * /*it*/, bool /*t*/) { p->fatigue += 15; p->rem_disease(DI_HALLU); @@ -507,7 +507,7 @@ void iuse::thorazine(game *g, player *p, item *it, bool t) g->add_msg_if_player(p,"You feel somewhat sedated."); } -void iuse::prozac(game *g, player *p, item *it, bool t) +void iuse::prozac(game *g, player *p, item * /*it*/, bool /*t*/) { if (!p->has_disease(DI_TOOK_PROZAC) && p->morale_level() < 0) p->add_disease(DI_TOOK_PROZAC, 7200, g); @@ -515,51 +515,51 @@ void iuse::prozac(game *g, player *p, item *it, bool t) p->stim += 3; } -void iuse::sleep(game *g, player *p, item *it, bool t) +void iuse::sleep(game *g, player *p, item * /*it*/, bool /*t*/) { p->fatigue += 40; g->add_msg_if_player(p,"You feel very sleepy..."); } -void iuse::iodine(game *g, player *p, item *it, bool t) +void iuse::iodine(game *g, player *p, item * /*it*/, bool /*t*/) { p->add_disease(DI_IODINE, 1200, g); g->add_msg_if_player(p,"You take an iodine tablet."); } -void iuse::flumed(game *g, player *p, item *it, bool t) +void iuse::flumed(game *g, player *p, item *it, bool /*t*/) { p->add_disease(DI_TOOK_FLUMED, 6000, g); g->add_msg_if_player(p,"You take some %s", it->tname().c_str()); } -void iuse::flusleep(game *g, player *p, item *it, bool t) +void iuse::flusleep(game *g, player *p, item * /*it*/, bool /*t*/) { p->add_disease(DI_TOOK_FLUMED, 7200, g); p->fatigue += 30; g->add_msg_if_player(p,"You feel very sleepy..."); } -void iuse::inhaler(game *g, player *p, item *it, bool t) +void iuse::inhaler(game *g, player *p, item * /*it*/, bool /*t*/) { p->rem_disease(DI_ASTHMA); g->add_msg_if_player(p,"You take a puff from your inhaler."); } -void iuse::blech(game *g, player *p, item *it, bool t) +void iuse::blech(game *g, player *p, item * /*it*/, bool /*t*/) { // TODO: Add more effects? g->add_msg_if_player(p,"Blech, that burns your throat!"); p->vomit(g); } -void iuse::mutagen(game *g, player *p, item *it, bool t) +void iuse::mutagen(game *g, player *p, item * /*it*/, bool /*t*/) { if (!one_in(3)) p->mutate(g); } -void iuse::mutagen_3(game *g, player *p, item *it, bool t) +void iuse::mutagen_3(game *g, player *p, item * /*it*/, bool /*t*/) { p->mutate(g); if (!one_in(3)) @@ -568,7 +568,7 @@ void iuse::mutagen_3(game *g, player *p, item *it, bool t) p->mutate(g); } -void iuse::purifier(game *g, player *p, item *it, bool t) +void iuse::purifier(game *g, player *p, item * /*it*/, bool /*t*/) { std::vector valid; // Which flags the player has for (int i = 1; i < PF_MAX2; i++) { @@ -650,7 +650,7 @@ void iuse::marloss(game *g, player *p, item *it, bool t) p->radiation = 0; } -void iuse::dogfood(game *g, player *p, item *it, bool t) +void iuse::dogfood(game *g, player *p, item * /*it*/, bool /*t*/) { int dirx, diry; g->draw(); @@ -679,7 +679,7 @@ void iuse::dogfood(game *g, player *p, item *it, bool t) // TOOLS below this point! -void iuse::lighter(game *g, player *p, item *it, bool t) +void iuse::lighter(game *g, player *p, item *it, bool /*t*/) { int dirx, diry; g->draw(); @@ -708,7 +708,7 @@ void iuse::lighter(game *g, player *p, item *it, bool t) } } -void iuse::sew(game *g, player *p, item *it, bool t) +void iuse::sew(game *g, player *p, item *it, bool /*t*/) { char ch = g->inv_type("Repair what?", IC_ARMOR); item* fix = &(p->i_at(ch)); @@ -795,7 +795,7 @@ void iuse::sew(game *g, player *p, item *it, bool t) } } -void iuse::scissors(game *g, player *p, item *it, bool t) +void iuse::scissors(game *g, player *p, item * /*it*/, bool /*t*/) { char ch = g->inv("Chop up what?"); item* cut = &(p->i_at(ch)); @@ -911,7 +911,7 @@ void iuse::scissors(game *g, player *p, item *it, bool t) } } -void iuse::extinguisher(game *g, player *p, item *it, bool t) +void iuse::extinguisher(game *g, player *p, item *it, bool /*t*/) { g->draw(); mvprintz(0, 0, c_red, "Pick a direction to spray:"); @@ -960,7 +960,7 @@ void iuse::extinguisher(game *g, player *p, item *it, bool t) } } -void iuse::hammer(game *g, player *p, item *it, bool t) +void iuse::hammer(game *g, player *p, item * /*it*/, bool /*t*/) { g->draw(); mvprintz(0, 0, c_red, "Pick a direction in which to pry:"); @@ -1001,7 +1001,7 @@ void iuse::hammer(game *g, player *p, item *it, bool t) g->m.ter(dirx, diry) = newter; } -void iuse::light_off(game *g, player *p, item *it, bool t) +void iuse::light_off(game *g, player *p, item *it, bool /*t*/) { if (it->charges == 0) g->add_msg_if_player(p,"The flashlight's batteries are dead."); @@ -1024,7 +1024,7 @@ void iuse::light_on(game *g, player *p, item *it, bool t) } } -void iuse::water_purifier(game *g, player *p, item *it, bool t) +void iuse::water_purifier(game *g, player *p, item *it, bool /*t*/) { it->charges++; char ch = g->inv_type("Purify what?", IC_COMESTIBLE); @@ -1052,7 +1052,7 @@ void iuse::water_purifier(game *g, player *p, item *it, bool t) pure->poison = 0; } -void iuse::two_way_radio(game *g, player *p, item *it, bool t) +void iuse::two_way_radio(game *g, player *p, item *it, bool /*t*/) { WINDOW* w = newwin(6, 36, 9, 5); wborder(w, LINE_XOXO, LINE_XOXO, LINE_OXOX, LINE_OXOX, @@ -1127,7 +1127,7 @@ void iuse::two_way_radio(game *g, player *p, item *it, bool t) refresh(); } -void iuse::radio_off(game *g, player *p, item *it, bool t) +void iuse::radio_off(game *g, player *p, item *it, bool /*t*/) { if (it->charges == 0) g->add_msg_if_player(p,"It's dead."); @@ -1185,7 +1185,7 @@ void iuse::radio_on(game *g, player *p, item *it, bool t) } } -void iuse::picklock(game *g, player *p, item *it, bool t) +void iuse::picklock(game *g, player *p, item * /*it*/, bool /*t*/) { int dirx, diry; g->draw(); @@ -1227,7 +1227,7 @@ void iuse::picklock(game *g, player *p, item *it, bool t) g->add_msg("That cannot be picked."); } } -void iuse::crowbar(game *g, player *p, item *it, bool t) +void iuse::crowbar(game *g, player *p, item * /*it*/, bool /*t*/) { int dirx, diry; g->draw(); @@ -1311,7 +1311,7 @@ if (dirx == 0 && diry == 0) { } } -void iuse::makemound(game *g, player *p, item *it, bool t) +void iuse::makemound(game *g, player *p, item * /*it*/, bool /*t*/) { if (g->m.has_flag(diggable, p->posx, p->posy)) { g->add_msg_if_player(p,"You churn up the earth here."); @@ -1321,7 +1321,7 @@ void iuse::makemound(game *g, player *p, item *it, bool t) g->add_msg_if_player(p,"You can't churn up this ground."); } -void iuse::dig(game *g, player *p, item *it, bool t) +void iuse::dig(game *g, player *p, item * /*it*/, bool /*t*/) { g->add_msg_if_player(p,"You can dig a pit via the construction menu--hit *"); /* @@ -1345,7 +1345,7 @@ void iuse::dig(game *g, player *p, item *it, bool t) */ } -void iuse::chainsaw_off(game *g, player *p, item *it, bool t) +void iuse::chainsaw_off(game *g, player *p, item *it, bool /*t*/) { p->moves -= 80; if (rng(0, 10) - it->damage > 5 && it->charges > 0) { @@ -1369,7 +1369,7 @@ void iuse::chainsaw_on(game *g, player *p, item *it, bool t) } } -void iuse::jackhammer(game *g, player *p, item *it, bool t) +void iuse::jackhammer(game *g, player *p, item *it, bool /*t*/) { int dirx, diry; g->draw(); @@ -1402,7 +1402,7 @@ void iuse::jackhammer(game *g, player *p, item *it, bool t) } } -void iuse::jacqueshammer(game *g, player *p, item *it, bool t) +void iuse::jacqueshammer(game *g, player *p, item *it, bool /*t*/) { int dirx, diry; g->draw(); @@ -1435,7 +1435,7 @@ void iuse::jacqueshammer(game *g, player *p, item *it, bool t) } } -void iuse::pickaxe(game *g, player *p, item *it, bool t) +void iuse::pickaxe(game *g, player *p, item * /*it*/, bool /*t*/) { /* int dirx, diry; g->draw(); @@ -1464,7 +1464,7 @@ void iuse::pickaxe(game *g, player *p, item *it, bool t) g->add_msg_if_player(p,"just expect them to work! Now put the pickaxe"); g->add_msg_if_player(p,"down and go play the game."); } -void iuse::set_trap(game *g, player *p, item *it, bool t) +void iuse::set_trap(game *g, player *p, item *it, bool /*t*/) { int dirx, diry; g->draw(); @@ -1663,13 +1663,13 @@ void iuse::geiger(game *g, player *p, item *it, bool t) } } -void iuse::teleport(game *g, player *p, item *it, bool t) +void iuse::teleport(game *g, player *p, item * /*it*/, bool /*t*/) { p->moves -= 100; g->teleport(p); } -void iuse::can_goo(game *g, player *p, item *it, bool t) +void iuse::can_goo(game *g, player *p, item *it, bool /*t*/) { it->make(g->itypes[itm_canister_empty]); int tries = 0, goox, gooy, junk; @@ -1714,7 +1714,7 @@ void iuse::can_goo(game *g, player *p, item *it, bool t) } -void iuse::pipebomb(game *g, player *p, item *it, bool t) +void iuse::pipebomb(game *g, player *p, item *it, bool /*t*/) { if (!p->has_charges(itm_lighter, 1)) { g->add_msg_if_player(p,"You need a lighter!"); @@ -1727,7 +1727,7 @@ void iuse::pipebomb(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::pipebomb_act(game *g, player *p, item *it, bool t) +void iuse::pipebomb_act(game *g, player * /*p*/, item *it, bool t) { int linet; point pos = g->find_item(it); @@ -1743,7 +1743,7 @@ void iuse::pipebomb_act(game *g, player *p, item *it, bool t) } } -void iuse::grenade(game *g, player *p, item *it, bool t) +void iuse::grenade(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You pull the pin on the grenade."); it->make(g->itypes[itm_grenade_act]); @@ -1751,7 +1751,7 @@ void iuse::grenade(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::grenade_act(game *g, player *p, item *it, bool t) +void iuse::grenade_act(game *g, player * /*p*/, item *it, bool t) { point pos = g->find_item(it); if (pos.x == -999 || pos.y == -999) @@ -1762,7 +1762,7 @@ void iuse::grenade_act(game *g, player *p, item *it, bool t) g->explosion(pos.x, pos.y, 12, 28, false); } -void iuse::flashbang(game *g, player *p, item *it, bool t) +void iuse::flashbang(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You pull the pin on the flashbang."); it->make(g->itypes[itm_flashbang_act]); @@ -1770,7 +1770,7 @@ void iuse::flashbang(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::flashbang_act(game *g, player *p, item *it, bool t) +void iuse::flashbang_act(game *g, player * /*p*/, item *it, bool t) { point pos = g->find_item(it); if (pos.x == -999 || pos.y == -999) @@ -1781,7 +1781,7 @@ void iuse::flashbang_act(game *g, player *p, item *it, bool t) g->flashbang(pos.x, pos.y); } -void iuse::c4(game *g, player *p, item *it, bool t) +void iuse::c4(game *g, player *p, item *it, bool /*t*/) { int time = query_int("Set the timer to (0 to cancel)?"); if (time == 0) { @@ -1794,7 +1794,7 @@ void iuse::c4(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::c4armed(game *g, player *p, item *it, bool t) +void iuse::c4armed(game *g, player * /*p*/, item *it, bool t) { point pos = g->find_item(it); if (pos.x == -999 || pos.y == -999) @@ -1805,7 +1805,7 @@ void iuse::c4armed(game *g, player *p, item *it, bool t) g->explosion(pos.x, pos.y, 40, 3, false); } -void iuse::EMPbomb(game *g, player *p, item *it, bool t) +void iuse::EMPbomb(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You pull the pin on the EMP grenade."); it->make(g->itypes[itm_EMPbomb_act]); @@ -1813,7 +1813,7 @@ void iuse::EMPbomb(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::EMPbomb_act(game *g, player *p, item *it, bool t) +void iuse::EMPbomb_act(game *g, player * /*p*/, item *it, bool t) { point pos = g->find_item(it); if (pos.x == -999 || pos.y == -999) @@ -1828,7 +1828,7 @@ void iuse::EMPbomb_act(game *g, player *p, item *it, bool t) } } -void iuse::scrambler(game *g, player *p, item *it, bool t) +void iuse::scrambler(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You pull the pin on the scrambler grenade."); it->make(g->itypes[itm_scrambler_act]); @@ -1836,7 +1836,7 @@ void iuse::scrambler(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::scrambler_act(game *g, player *p, item *it, bool t) +void iuse::scrambler_act(game *g, player * /*p*/, item *it, bool t) { point pos = g->find_item(it); if (pos.x == -999 || pos.y == -999) @@ -1851,7 +1851,7 @@ void iuse::scrambler_act(game *g, player *p, item *it, bool t) } } -void iuse::gasbomb(game *g, player *p, item *it, bool t) +void iuse::gasbomb(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You pull the pin on the teargas canister."); it->make(g->itypes[itm_gasbomb_act]); @@ -1859,7 +1859,7 @@ void iuse::gasbomb(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::gasbomb_act(game *g, player *p, item *it, bool t) +void iuse::gasbomb_act(game *g, player * /*p*/, item *it, bool t) { point pos = g->find_item(it); if (pos.x == -999 || pos.y == -999) @@ -1881,7 +1881,7 @@ void iuse::gasbomb_act(game *g, player *p, item *it, bool t) it->make(g->itypes[itm_canister_empty]); } -void iuse::smokebomb(game *g, player *p, item *it, bool t) +void iuse::smokebomb(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You pull the pin on the smoke bomb."); it->make(g->itypes[itm_smokebomb_act]); @@ -1889,7 +1889,7 @@ void iuse::smokebomb(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::smokebomb_act(game *g, player *p, item *it, bool t) +void iuse::smokebomb_act(game *g, player * /*p*/, item *it, bool t) { point pos = g->find_item(it); if (pos.x == -999 || pos.y == -999) @@ -1911,7 +1911,7 @@ void iuse::smokebomb_act(game *g, player *p, item *it, bool t) it->make(g->itypes[itm_canister_empty]); } -void iuse::acidbomb(game *g, player *p, item *it, bool t) +void iuse::acidbomb(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You remove the divider, and the chemicals mix."); p->moves -= 150; @@ -1921,7 +1921,7 @@ void iuse::acidbomb(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::acidbomb_act(game *g, player *p, item *it, bool t) +void iuse::acidbomb_act(game *g, player *p, item *it, bool /*t*/) { if (!p->has_item(it)) { point pos = g->find_item(it); @@ -1935,7 +1935,7 @@ void iuse::acidbomb_act(game *g, player *p, item *it, bool t) } } -void iuse::molotov(game *g, player *p, item *it, bool t) +void iuse::molotov(game *g, player *p, item *it, bool /*t*/) { if (!p->has_charges(itm_lighter, 1)) { g->add_msg_if_player(p,"You need a lighter!"); @@ -1950,7 +1950,7 @@ void iuse::molotov(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::molotov_lit(game *g, player *p, item *it, bool t) +void iuse::molotov_lit(game *g, player *p, item *it, bool /*t*/) { int age = int(g->turn) - it->bday; if (!p->has_item(it)) { @@ -1967,7 +1967,7 @@ void iuse::molotov_lit(game *g, player *p, item *it, bool t) } } -void iuse::dynamite(game *g, player *p, item *it, bool t) +void iuse::dynamite(game *g, player *p, item *it, bool /*t*/) { if (!p->has_charges(itm_lighter, 1)) { g->add_msg_if_player(p,"You need a lighter!"); @@ -1980,7 +1980,7 @@ void iuse::dynamite(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::dynamite_act(game *g, player *p, item *it, bool t) +void iuse::dynamite_act(game *g, player * /*p*/, item *it, bool t) { point pos = g->find_item(it); if (pos.x == -999 || pos.y == -999) @@ -1991,7 +1991,7 @@ void iuse::dynamite_act(game *g, player *p, item *it, bool t) g->explosion(pos.x, pos.y, 60, 0, false); } -void iuse::mininuke(game *g, player *p, item *it, bool t) +void iuse::mininuke(game *g, player *p, item *it, bool /*t*/) { g->add_msg_if_player(p,"You activate the mininuke."); it->make(g->itypes[itm_mininuke_act]); @@ -1999,7 +1999,7 @@ void iuse::mininuke(game *g, player *p, item *it, bool t) it->active = true; } -void iuse::mininuke_act(game *g, player *p, item *it, bool t) +void iuse::mininuke_act(game *g, player * /*p*/, item *it, bool t) { point pos = g->find_item(it); if (pos.x == -999 || pos.y == -999) @@ -2019,7 +2019,7 @@ void iuse::mininuke_act(game *g, player *p, item *it, bool t) } } -void iuse::pheromone(game *g, player *p, item *it, bool t) +void iuse::pheromone(game *g, player *p, item * /*it*/, bool /*t*/) { point pos(p->posx, p->posy); @@ -2057,12 +2057,12 @@ void iuse::pheromone(game *g, player *p, item *it, bool t) } -void iuse::portal(game *g, player *p, item *it, bool t) +void iuse::portal(game *g, player *p, item * /*it*/, bool /*t*/) { g->m.add_trap(p->posx + rng(-2, 2), p->posy + rng(-2, 2), tr_portal); } -void iuse::manhack(game *g, player *p, item *it, bool t) +void iuse::manhack(game *g, player *p, item *it, bool /*t*/) { std::vector valid; // Valid spawn locations for (int x = p->posx - 1; x <= p->posx + 1; x++) { @@ -2087,7 +2087,7 @@ void iuse::manhack(game *g, player *p, item *it, bool t) g->z.push_back(manhack); } -void iuse::turret(game *g, player *p, item *it, bool t) +void iuse::turret(game *g, player *p, item *it, bool /*t*/) { int dirx, diry; g->draw(); @@ -2114,7 +2114,7 @@ void iuse::turret(game *g, player *p, item *it, bool t) g->z.push_back(turret); } -void iuse::UPS_off(game *g, player *p, item *it, bool t) +void iuse::UPS_off(game *g, player *p, item *it, bool /*t*/) { if (it->charges == 0) g->add_msg_if_player(p,"The power supply's batteries are dead."); @@ -2138,7 +2138,7 @@ void iuse::UPS_on(game *g, player *p, item *it, bool t) } } -void iuse::tazer(game *g, player *p, item *it, bool t) +void iuse::tazer(game *g, player *p, item *it, bool /*t*/) { int dirx, diry; g->draw(); @@ -2211,7 +2211,7 @@ void iuse::tazer(game *g, player *p, item *it, bool t) } -void iuse::mp3(game *g, player *p, item *it, bool t) +void iuse::mp3(game *g, player *p, item *it, bool /*t*/) { if (it->charges == 0) g->add_msg_if_player(p,"The mp3 player's batteries are dead."); @@ -2252,7 +2252,7 @@ void iuse::mp3_on(game *g, player *p, item *it, bool t) } } -void iuse::vortex(game *g, player *p, item *it, bool t) +void iuse::vortex(game *g, player *p, item *it, bool /*t*/) { std::vector spawn; for (int i = -3; i <= 3; i++) { @@ -2280,7 +2280,7 @@ void iuse::vortex(game *g, player *p, item *it, bool t) g->z.push_back(vortex); } -void iuse::dog_whistle(game *g, player *p, item *it, bool t) +void iuse::dog_whistle(game *g, player *p, item * /*it*/, bool /*t*/) { g->add_msg_if_player(p,"You blow your dog whistle."); for (int i = 0; i < g->z.size(); i++) { @@ -2300,7 +2300,7 @@ void iuse::dog_whistle(game *g, player *p, item *it, bool t) } } -void iuse::vacutainer(game *g, player *p, item *it, bool t) +void iuse::vacutainer(game *g, player *p, item *it, bool /*t*/) { if (p->is_npc()) return; // No NPCs for now! @@ -2330,7 +2330,7 @@ void iuse::vacutainer(game *g, player *p, item *it, bool t) it->put_in(blood); } - void iuse::knife(game *g, player *p, item *it, bool t) + void iuse::knife(game *g, player *p, item * /*it*/, bool /*t*/) { int ch = menu( "Using knife:", "Cut up fabric", "Carve wood", "Cancel", NULL); @@ -2512,7 +2512,7 @@ break; } } -void iuse::lumber(game *g, player *p, item *it, bool t) +void iuse::lumber(game *g, player *p, item * /*it*/, bool /*t*/) { char ch = g->inv("Cut up what?"); item* cut = &(p->i_at(ch)); @@ -2567,7 +2567,7 @@ void iuse::lumber(game *g, player *p, item *it, bool t) } -void iuse::hacksaw(game *g, player *p, item *it, bool t) +void iuse::hacksaw(game *g, player *p, item * /*it*/, bool /*t*/) { int dirx, diry; g->draw(); @@ -2596,8 +2596,8 @@ if (dirx == 0 && diry == 0) { g->sound(dirx, diry, 15,"grnd grnd grnd"); g->m.add_item(p->posx, p->posy, g->itypes[itm_pipe], 0, rng(1, 3)); g->m.add_item(p->posx, p->posy, g->itypes[itm_steel_chunk], 0); - } else if (g->m.ter(dirx, diry) == t_bars && g->m.ter(dirx + 1, diry) == t_sewage || - g->m.ter(dirx, diry + 1) == t_sewage) { + } else if (g->m.ter(dirx, diry) == t_bars && (g->m.ter(dirx + 1, diry) == t_sewage || + g->m.ter(dirx, diry + 1) == t_sewage)) { g->m.ter(dirx, diry) = t_sewage; p->moves -= 1000; g->sound(dirx, diry, 15,"grnd grnd grnd"); @@ -2612,7 +2612,7 @@ if (dirx == 0 && diry == 0) { } } -void iuse::tent(game *g, player *p, item *it, bool t) +void iuse::tent(game *g, player *p, item *it, bool /*t*/) { int dirx, diry; g->draw(); @@ -2640,7 +2640,7 @@ void iuse::tent(game *g, player *p, item *it, bool t) it->invlet = 0; } -void iuse::torch(game *g, player *p, item *it, bool t) +void iuse::torch(game *g, player *p, item *it, bool /*t*/) { if (!p->has_charges(itm_lighter, 1)) g->add_msg_if_player(p,"You need a lighter or fire to light this."); @@ -2665,7 +2665,7 @@ void iuse::torch_lit(game *g, player *p, item *it, bool t) } -void iuse::candle(game *g, player *p, item *it, bool t) +void iuse::candle(game *g, player *p, item *it, bool /*t*/) { if (!p->has_charges(itm_lighter, 1)) g->add_msg_if_player(p,"You need a lighter to light this."); @@ -2689,7 +2689,7 @@ void iuse::candle_lit(game *g, player *p, item *it, bool t) } -void iuse::bullet_puller(game *g, player *p, item *it, bool t) +void iuse::bullet_puller(game *g, player *p, item * /*it*/, bool /*t*/) { char ch = g->inv("Disassemble what?"); item* pull = &(p->i_at(ch)); @@ -2943,7 +2943,7 @@ void iuse::bullet_puller(game *g, player *p, item *it, bool t) g->m.add_item(p->posx, p->posy, lead); } -void iuse::boltcutters(game *g, player *p, item *it, bool t) +void iuse::boltcutters(game *g, player *p, item * /*it*/, bool /*t*/) { int dirx, diry; g->draw(); @@ -2977,7 +2977,7 @@ if (dirx == 0 && diry == 0) { } } -void iuse::mop(game *g, player *p, item *it, bool t) +void iuse::mop(game *g, player *p, item * /*it*/, bool /*t*/) { int dirx, diry; g->draw(); @@ -3002,7 +3002,7 @@ void iuse::mop(game *g, player *p, item *it, bool t) g->add_msg_if_player(p,"There's nothing to mop there."); } } -void iuse::rag(game *g, player *p, item *it, bool t) +void iuse::rag(game *g, player *p, item *it, bool /*t*/) { if (p->has_disease(DI_BLEED)){ if (one_in(2)){ @@ -3019,7 +3019,7 @@ void iuse::rag(game *g, player *p, item *it, bool t) } -void iuse::pda(game *g, player *p, item *it, bool t) +void iuse::pda(game *g, player *p, item *it, bool /*t*/) { if (it->charges == 0) g->add_msg_if_player(p,"The PDA's batteries are dead."); @@ -3045,7 +3045,7 @@ void iuse::pda_flashlight(game *g, player *p, item *it, bool t) /* MACGUFFIN FUNCTIONS * These functions should refer to it->associated_mission for the particulars */ -void iuse::mcg_note(game *g, player *p, item *it, bool t) +void iuse::mcg_note(game * /*g*/, player * /*p*/, item *it, bool /*t*/) { std::stringstream message; message << "Dear " << it->name << ":\n"; @@ -3091,7 +3091,7 @@ you can, I need to know you're alright."; */ } -void iuse::artifact(game *g, player *p, item *it, bool t) +void iuse::artifact(game *g, player *p, item *it, bool /*t*/) { if (!it->is_artifact()) { debugmsg("iuse::artifact called on a non-artifact item! %s", @@ -3415,7 +3415,7 @@ void iuse::artifact(game *g, player *p, item *it, bool t) } } -void iuse::spray_can(game *g, player *p, item *it, bool t) +void iuse::spray_can(game *g, player *p, item * /*it*/, bool /*t*/) { std::string message = string_input_popup("Spray what?"); if(g->m.add_graffiti(g, p->posx, p->posy, message)) diff --git a/map.cpp b/map.cpp index 808404db60205..4fcb082f8f7dc 100644 --- a/map.cpp +++ b/map.cpp @@ -231,7 +231,7 @@ void map::board_vehicle(game *g, int x, int y, player *p) g->update_map(x, y); } -void map::unboard_vehicle(game *g, const int x, const int y) +void map::unboard_vehicle(game * /*g*/, const int x, const int y) { int part = 0; vehicle *veh = veh_at(x, y, part); @@ -720,7 +720,7 @@ bool map::vehproceed(game* g){ } // accept new position // if submap changed, we need to process grid from the beginning. - int sm_change = displace_vehicle (g, x, y, dx, dy); + // int sm_change = displace_vehicle (g, x, y, dx, dy); -- Not used for anything } else { // can_move veh->stop(); } @@ -963,7 +963,7 @@ point map::random_outdoor_tile() return options[rng(0, options.size() - 1)]; } -bool map::has_adjacent_furniture(const int x, const int y) +bool map::has_adjacent_furniture(const int /*x*/, const int /*y*/) { for (int i = -1; i <= 1; i += 2) for (int j = -1; j <= 1; j += 2) @@ -1286,7 +1286,7 @@ case t_wall_log: if (str >= result) { // Special code to collapse the tent if destroyed - int tentx, tenty = -1; + int tentx = -1, tenty = -1; // Find the center of the tent for (int i = -1; i <= 1; i++) for (int j = -1; j <= 1; j++) @@ -1597,7 +1597,7 @@ void map::destroy(game *g, const int x, const int y, const bool makesound) ter(x, y) = t_rubble; for (int i = x - 1; i <= x + 1; i++) for (int j = y - 1; j <= y + 1; j++) { - if (i == x && j == y || !has_flag(collapses, i, j)) + if ((i == x && j == y) || !has_flag(collapses, i, j)) continue; int num_supports = -1; for (int k = i - 1; k <= i + 1; k++) @@ -1634,7 +1634,7 @@ void map::destroy(game *g, const int x, const int y, const bool makesound) ter(x, y) = t_rubble; for (int i = x - 1; i <= x + 1; i++) for (int j = y - 1; j <= y + 1; j++) { - if (i == x && j == y || !has_flag(supports_roof, i, j)) + if ((i == x && j == y) || !has_flag(supports_roof, i, j)) continue; int num_supports = 0; for (int k = i - 1; k <= i + 1; k++) @@ -1835,7 +1835,7 @@ void map::shoot(game *g, const int x, const int y, int &dam, } } -bool map::hit_with_acid(game *g, const int x, const int y) +bool map::hit_with_acid(game * /*g*/, const int x, const int y) { if (move_cost(x, y) != 0) return false; // Didn't hit the tile! @@ -2074,13 +2074,14 @@ void map::add_item(const int x, const int y, itype* type, const int birthday, co if (type->is_style()) return; item tmp(type, birthday); - if (quantity) + if (quantity){ if(tmp.charges > 0) tmp.charges = quantity; else // If the item doesn't have charges, recurse and create the requested number of seperate items. for(int i = 0; i < quantity; i++) add_item(x, y, type, birthday); + } tmp = tmp.in_its_container(itypes); if (tmp.made_of(LIQUID) && has_flag(swimmable, x, y)) return; @@ -2406,8 +2407,8 @@ computer* map::computer_at(const int x, const int y) */ const int nonant = int(x / SEEX) + int(y / SEEY) * my_MAPSIZE; - const int lx = x % SEEX; - const int ly = y % SEEY; + //const int lx = x % SEEX; -- Unused + //const int ly = y % SEEY; -- Unused if (grid[nonant]->comp.name == "") return NULL; return &(grid[nonant]->comp); @@ -3178,7 +3179,7 @@ bool map::inbounds(const int x, const int y) return (x >= 0 && x < SEEX * my_MAPSIZE && y >= 0 && y < SEEY * my_MAPSIZE); } -bool map::add_graffiti(game *g, int x, int y, std::string contents) +bool map::add_graffiti(game * /*g*/, int x, int y, std::string contents) { int nx = x; int ny = y; diff --git a/mapbuffer.cpp b/mapbuffer.cpp index 8b6a1df0c0c37..6aa34281e2a1b 100644 --- a/mapbuffer.cpp +++ b/mapbuffer.cpp @@ -195,7 +195,7 @@ void mapbuffer::load() return; int itx, ity, t, d, a, num_submaps, num_loaded=0; - bool fields_here = false; + bool fields_here = false; // Unused item it_tmp; std::string databuff; fin >> num_submaps; diff --git a/mapgen.cpp b/mapgen.cpp index abaf84c1bcf89..a8405cb23d6ee 100644 --- a/mapgen.cpp +++ b/mapgen.cpp @@ -231,11 +231,11 @@ void map::draw_map(oter_id terrain_type, oter_id t_north, oter_id t_east, // integer that indicates on which turn the items were created. This final // integer should be 0, unless the items are "fresh-grown" like wild fruit. - int rn, lw, rw, mw, tw, bw, cw, x, y; + int rn = 0, lw = 0, rw = 0, mw = 0, tw = 0, bw = 0, cw = 0, x = 0, y = 0; int n_fac = 0, e_fac = 0, s_fac = 0, w_fac = 0; computer *tmpcomp = NULL; - int SEEX_oth=SEEX; - int SEEY_oth=SEEY-5; + //int SEEX_oth=SEEX; -- unused + //int SEEY_oth=SEEY-5; -- unused switch (terrain_type) { @@ -2883,8 +2883,8 @@ case ot_lmoe: { // Fill rooms with items! for (int i = 2; i <= 15; i += 13) { - items_location goods; - int size; + items_location goods = items_location(0); + int size = 0; switch (rng(1, 14)) { case 1: case 2: goods = mi_bots; size = 85; break; @@ -4242,7 +4242,7 @@ case ot_lmoe: { } else { // Level 1 int cavex = SEEX, cavey = SEEY * 2 - 3; int stairsx = SEEX - 1, stairsy = 1; // Default stairs location--may change - int centerx; + int centerx = 0; do { cavex += rng(-1, 1); cavey -= rng(0, 1); @@ -7709,7 +7709,8 @@ bool connects_to(oter_id there, int dir) void house_room(map *m, room_type type, int x1, int y1, int x2, int y2) { - int pos_x1=0; int pos_x2=0; int pos_y1=0; int pos_y2=0; + int pos_x1=0; int pos_y1=0; + // int pos_x2=0; int pos_y2=0; -- Unused for (int i = x1; i <= x2; i++) { for (int j = y1; j <= y2; j++) { if (m->ter(i, j) == t_grass || m->ter(i, j) == t_dirt || @@ -8934,8 +8935,8 @@ void map::add_extra(map_extra type, game *g) if (move_cost(x, y) != 0) ter(x, y) = t_dirt; - int size; - items_location stash; + int size = 0; + items_location stash = items_location(0); switch (rng(1, 6)) { // What kind of stash? case 1: stash = mi_stash_food; size = 90; break; case 2: stash = mi_stash_ammo; size = 80; break; @@ -8953,7 +8954,7 @@ void map::add_extra(map_extra type, game *g) for (int i = x - 4; i <= x + 4; i++) { for (int j = y - 4; j <= y + 4; j++) { if (i >= 0 && j >= 0 && i < SEEX * 2 && j < SEEY * 2 && one_in(4)) { - trap_id placed; + trap_id placed = trap_id(0); switch (rng(1, 7)) { case 1: case 2: @@ -8978,8 +8979,8 @@ void map::add_extra(map_extra type, game *g) case mx_drugdeal: { // Decide on a drug type - int num_drugs; - itype* drugtype; + int num_drugs = 0; + itype* drugtype = NULL; switch (rng(1, 10)) { case 1: // Weed num_drugs = rng(20, 30); diff --git a/melee.cpp b/melee.cpp index 85cfa6d3da1fb..1337d70de5be9 100644 --- a/melee.cpp +++ b/melee.cpp @@ -170,9 +170,11 @@ int player::hit_mon(game *g, monster *z, bool allow_grab) // defaults to true int pain = 0; // Boost to pain; required for perform_technique // Moves lost to getting your weapon stuck + /* -- Unused int stuck_penalty = roll_stuck_penalty(z, (stab_dam >= cut_dam)); if (weapon.is_style()) stuck_penalty = 0; + */ // Pick one or more special attacks technique_id technique = pick_technique(g, z, NULL, critical_hit, allow_grab); @@ -297,9 +299,11 @@ void player::hit_player(game *g, player &p, bool allow_grab) int pain = 0; // Boost to pain; required for perform_technique // Moves lost to getting your weapon stuck + /* -- Unused int stuck_penalty = roll_stuck_penalty(NULL, (stab_dam >= cut_dam)); if (weapon.is_style()) stuck_penalty = 0; + */ // Pick one or more special attacks technique_id technique = pick_technique(g, NULL, &p, critical_hit, allow_grab); @@ -772,8 +776,8 @@ technique_id player::pick_technique(game *g, monster *z, player *p, } void player::perform_technique(technique_id technique, game *g, monster *z, - player *p, int &bash_dam, int &cut_dam, - int &stab_dam, int &pain) + player *p, int &bash_dam, int & /*cut_dam*/, + int & /*stab_dam*/, int &pain) { bool mon = (z != NULL); std::string You = (is_npc() ? name : "You"); @@ -1580,7 +1584,7 @@ void melee_practice(player &u, bool hit, bool unarmed, bool bashing, } } -int attack_speed(player &u, bool missed) +int attack_speed(player &u, bool /*missed*/) { int move_cost = u.weapon.attack_time() + 20 * u.encumb(bp_torso); if (u.has_trait(PF_LIGHT_BONES)) diff --git a/mission_start.cpp b/mission_start.cpp index 30474acd7cba4..a5ec46552013c 100644 --- a/mission_start.cpp +++ b/mission_start.cpp @@ -8,7 +8,7 @@ * updating *miss with the target and any other important information. */ -void mission_start::standard(game *g, mission *miss) +void mission_start::standard(game * /*g*/, mission * /*miss*/) { } @@ -251,6 +251,6 @@ void mission_start::find_safety(game *g, mission *miss) } } -void mission_start::place_book(game *g, mission *miss) +void mission_start::place_book(game * /*g*/, mission * /*miss*/) { } diff --git a/monattack.cpp b/monattack.cpp index 5d4c67fa6ddcc..3d722b8001eb3 100644 --- a/monattack.cpp +++ b/monattack.cpp @@ -764,7 +764,7 @@ void mattack::plant(game *g, monster *z) } } -void mattack::disappear(game *g, monster *z) +void mattack::disappear(game * /*g*/, monster *z) { z->hp = 0; } @@ -1124,7 +1124,7 @@ void mattack::tazer(game *g, monster *z) void mattack::smg(game *g, monster *z) { - int t, j, fire_t; + int t = 0, j = 0, fire_t = 0; if (z->friendly != 0) { // Attacking monsters, not the player! monster* target = NULL; int closest = 19; diff --git a/mondeath.cpp b/mondeath.cpp index 90ea7263a738b..3e6f34892937d 100644 --- a/mondeath.cpp +++ b/mondeath.cpp @@ -115,7 +115,7 @@ void mdeath::vine_cut(game *g, monster *z) } } -void mdeath::triffid_heart(game *g, monster *z) +void mdeath::triffid_heart(game *g, monster * /*z*/) { g->add_msg("The root walls begin to crumble around you."); g->add_event(EVENT_ROOTS_DIE, int(g->turn) + 100); @@ -286,7 +286,7 @@ void mdeath::thing(game *g, monster *z) void mdeath::explode(game *g, monster *z) { - int size; + int size = 0; switch (z->type->size) { case MS_TINY: size = 4; break; case MS_SMALL: size = 8; break; @@ -297,7 +297,7 @@ void mdeath::explode(game *g, monster *z) g->explosion(z->posx, z->posy, size, 0, false); } -void mdeath::ratking(game *g, monster *z) +void mdeath::ratking(game *g, monster * /*z*/) { g->u.rem_disease(DI_RAT); } @@ -308,7 +308,7 @@ void mdeath::gameover(game *g, monster *z) g->u.hp_cur[hp_torso] = 0; } -void mdeath::kill_breathers(game *g, monster *z) +void mdeath::kill_breathers(game *g, monster * /*z*/) { for (int i = 0; i < g->z.size(); i++) { if (g->z[i].type->id == mon_breather_hub || g->z[i].type->id == mon_breather) diff --git a/monmove.cpp b/monmove.cpp index e720557f8d991..b6974d8332e9a 100644 --- a/monmove.cpp +++ b/monmove.cpp @@ -70,7 +70,7 @@ void monster::plan(game *g) int sightrange = g->light_level(); int closest = -1; int dist = 1000; - int tc, stc; + int tc = 0, stc = 0; bool fleeing = false; if (friendly != 0) { // Target monsters, not the player! for (int i = 0; i < g->z.size(); i++) { @@ -361,8 +361,7 @@ point monster::scent_move(game *g) std::vector smoves; int maxsmell = 2; // Squares with smell 0 are not eligable targets - if (has_flag(MF_KEENNOSE)) { - int maxsmell = 1; } + if (has_flag(MF_KEENNOSE)) { maxsmell = 1; } int minsmell = 9999; point pbuff, next(-1, -1); unsigned int smell; @@ -628,12 +627,13 @@ void monster::move_to(game *g, int x, int y) void monster::stumble(game *g, bool moved) { // don't stumble every turn. every 3rd turn, or 8th when walking. - if(moved) + if(moved){ if(!one_in(8)) return; else if(!one_in(3)) return; + } std::vector valid_stumbles; for (int i = -1; i <= 1; i++) { diff --git a/monster.cpp b/monster.cpp index e782bce5faf3c..e615638e4bd84 100644 --- a/monster.cpp +++ b/monster.cpp @@ -479,7 +479,7 @@ int monster::hit(game *g, player &p, body_part &bp_hit) { } p.practice("dodge", 5); int ret = 0; - int highest_hit; + int highest_hit = 0; switch (type->size) { case MS_TINY: highest_hit = 3; diff --git a/mutation.cpp b/mutation.cpp index c3f5f6a863dff..32c12adc2f2c8 100644 --- a/mutation.cpp +++ b/mutation.cpp @@ -221,7 +221,8 @@ void player::remove_child_flag(game *g, pl_flag flag) void mutation_effect(game *g, player &p, pl_flag mut) { bool is_u = (&p == &(g->u)); - bool destroy = false, skip_cloth = false; + bool destroy = false; + bool skip_cloth = false; // Unused std::vector bps; switch (mut) { @@ -340,7 +341,7 @@ void mutation_effect(game *g, player &p, pl_flag mut) } } -void mutation_loss_effect(game *g, player &p, pl_flag mut) +void mutation_loss_effect(game * /*g*/, player &p, pl_flag mut) { switch (mut) { case PF_STR_UP: diff --git a/npc.cpp b/npc.cpp index 5b3bed6314ed2..18690aa3e96be 100644 --- a/npc.cpp +++ b/npc.cpp @@ -206,7 +206,7 @@ std::string npc::save_info() return dump.str(); } -void npc::load_info(game *g, std::string data) +void npc::load_info(game * /*g*/, std::string data) { std::stringstream dump; std::string tmpname; @@ -1254,7 +1254,7 @@ void npc::form_opinion(player *u) attitude = NPCATT_FLEE; } -talk_topic npc::pick_talk_topic(player *u) +talk_topic npc::pick_talk_topic(player * /*u*/) { //form_opinion(u); if (personality.aggression > 0) { @@ -1337,7 +1337,7 @@ void npc::make_angry() attitude = NPCATT_KILL; // Yeah, we think we could take you! } -bool npc::wants_to_travel_with(player *p) +bool npc::wants_to_travel_with(player * /*p*/) { return true; } diff --git a/npcmove.cpp b/npcmove.cpp index 658d3b56852ae..ffd2d7551bedc 100644 --- a/npcmove.cpp +++ b/npcmove.cpp @@ -496,7 +496,7 @@ npc_action npc::method_of_attack(game *g, int target, int danger) return npc_melee; } -npc_action npc::address_needs(game *g, int danger) +npc_action npc::address_needs(game * /*g*/, int danger) { if (has_healing_item()) { for (int i = 0; i < num_hp_parts; i++) { @@ -640,7 +640,7 @@ int npc::choose_escape_item() return ret; } -void npc::use_escape_item(game *g, int index, int target) +void npc::use_escape_item(game *g, int index, int /*target*/) { if (index < 0 || index >= inv.size()) { debugmsg("%s tried to use item %d (%d in inv)", name.c_str(), index, @@ -1428,8 +1428,8 @@ void npc::alt_attack(game *g, int target) move_to(g, tarx, tary); } - int index; - item *used; + int index = 0; + item *used = NULL; if (weapon.type->id == which) { used = &weapon; index = -1; @@ -1554,7 +1554,7 @@ void npc::heal_player(game *g, player &patient) move_to_next(g); } else { // Close enough to heal! int lowest_HP = 400; - hp_part worst; + hp_part worst = hp_part(0); // Chose the worst-hurting body part for (int i = 0; i < num_hp_parts; i++) { int hp = patient.hp_cur[i]; @@ -1585,7 +1585,7 @@ void npc::heal_player(game *g, player &patient) else g->add_msg("Someone heals you."); - int amount_healed; + int amount_healed = 0; if (has_amount(itm_1st_aid, 1)) { switch (worst) { case hp_head: amount_healed = 10 + 1.6 * sklevel[sk_firstaid]; break; @@ -1620,7 +1620,7 @@ void npc::heal_player(game *g, player &patient) void npc::heal_self(game *g) { int lowest_HP = 400; - hp_part worst; + hp_part worst = hp_part(0); // Chose the worst-hurting body part for (int i = 0; i < num_hp_parts; i++) { int hp = hp_cur[i]; @@ -1635,7 +1635,7 @@ void npc::heal_self(game *g) } } - int amount_healed; + int amount_healed = 0; if (has_amount(itm_1st_aid, 1)) { switch (worst) { case hp_head: amount_healed = 10 + 1.6 * sklevel[sk_firstaid]; break; @@ -1865,7 +1865,7 @@ bool npc::has_destination() return (goalx >= 0 && goalx < OMAPX && goaly >= 0 && goaly < OMAPY); } -void npc::reach_destination(game *g) +void npc::reach_destination(game * /*g*/) { goalx = -1; goaly = -1; diff --git a/npctalk.cpp b/npctalk.cpp index 7a4b647d59379..3ecd83e3b5f63 100644 --- a/npctalk.cpp +++ b/npctalk.cpp @@ -1326,7 +1326,7 @@ void talk_function::give_equipment(game *g, npc *p) p->add_disease(DI_ASKED_FOR_ITEM, 1800, g); } -void talk_function::follow(game *g, npc *p) +void talk_function::follow(game * /*g*/, npc *p) { p->attitude = NPCATT_FOLLOW; } @@ -1371,7 +1371,7 @@ void talk_function::start_mugging(game *g, npc *p) p->name.c_str()); } -void talk_function::player_leaving(game *g, npc *p) +void talk_function::player_leaving(game * /*g*/, npc *p) { p->attitude = NPCATT_WAIT_FOR_LEAVE; p->patience = 15 - p->personality.aggression; @@ -1382,12 +1382,12 @@ void talk_function::drop_weapon(game *g, npc *p) g->m.add_item(p->posx, p->posy, p->remove_weapon()); } -void talk_function::player_weapon_away(game *g, npc *p) +void talk_function::player_weapon_away(game *g, npc * /*p*/) { g->u.i_add(g->u.remove_weapon()); } -void talk_function::player_weapon_drop(game *g, npc *p) +void talk_function::player_weapon_drop(game *g, npc * /*p*/) { g->m.add_item(g->u.posx, g->u.posy, g->u.remove_weapon()); } @@ -1402,37 +1402,37 @@ void talk_function::lead_to_safety(game *g, npc *p) p->attitude = NPCATT_LEAD; } -void talk_function::toggle_use_guns(game *g, npc *p) +void talk_function::toggle_use_guns(game * /*g*/, npc *p) { p->combat_rules.use_guns = !p->combat_rules.use_guns; } -void talk_function::toggle_use_grenades(game *g, npc *p) +void talk_function::toggle_use_grenades(game * /*g*/, npc *p) { p->combat_rules.use_grenades = !p->combat_rules.use_grenades; } -void talk_function::set_engagement_none(game *g, npc *p) +void talk_function::set_engagement_none(game * /*g*/, npc *p) { p->combat_rules.engagement = ENGAGE_NONE; } -void talk_function::set_engagement_close(game *g, npc *p) +void talk_function::set_engagement_close(game * /*g*/, npc *p) { p->combat_rules.engagement = ENGAGE_CLOSE; } -void talk_function::set_engagement_weak(game *g, npc *p) +void talk_function::set_engagement_weak(game * /*g*/, npc *p) { p->combat_rules.engagement = ENGAGE_WEAK; } -void talk_function::set_engagement_hit(game *g, npc *p) +void talk_function::set_engagement_hit(game * /*g*/, npc *p) { p->combat_rules.engagement = ENGAGE_HIT; } -void talk_function::set_engagement_all(game *g, npc *p) +void talk_function::set_engagement_all(game * /*g*/, npc *p) { p->combat_rules.engagement = ENGAGE_ALL; } @@ -1441,10 +1441,10 @@ void talk_function::start_training(game *g, npc *p) { int cost = 0, time = 0; skill sk_used = sk_null; - itype_id style = itm_null; + // itype_id style = itm_null; -- Unused if (p->chatbin.tempvalue < 0) { cost = -800; - style = itype_id(0 - p->chatbin.tempvalue); + // style = itype_id(0 - p->chatbin.tempvalue); -- Unused time = 30000; } else { sk_used = skill(p->chatbin.tempvalue); @@ -1847,20 +1847,20 @@ Tab key to switch lists, letters to pick items, Enter to finalize, Esc to quit\n ch -= 'a'; if (focus_them) { if (ch < theirs.size()) { - getting_theirs[ch] = !getting_theirs[ch]; - if (getting_theirs[ch]) - cash -= their_price[ch]; + getting_theirs[unsigned(ch)] = !getting_theirs[unsigned(ch)]; + if (getting_theirs[unsigned(ch)]) + cash -= their_price[unsigned(ch)]; else - cash += their_price[ch]; + cash += their_price[unsigned(ch)]; update = true; } } else { // Focus is on the player's inventory if (ch < yours.size()) { - getting_yours[ch] = !getting_yours[ch]; - if (getting_yours[ch]) - cash += your_price[ch]; + getting_yours[unsigned(ch)] = !getting_yours[unsigned(ch)]; + if (getting_yours[unsigned(ch)]) + cash += your_price[unsigned(ch)]; else - cash -= your_price[ch]; + cash -= your_price[unsigned(ch)]; update = true; } } diff --git a/output.cpp b/output.cpp index 4f5d06346a7df..47df1e44c81a6 100644 --- a/output.cpp +++ b/output.cpp @@ -730,7 +730,7 @@ void compare_split_screen_popup(bool bLeft, std::string sItemName, std::vector 36) { diff --git a/overmap.cpp b/overmap.cpp index ee2dd0a9fa3db..a7eefed8176fd 100644 --- a/overmap.cpp +++ b/overmap.cpp @@ -317,7 +317,7 @@ point overmap::display_notes() return point(-1,-1); } -void overmap::generate(game *g, overmap* north, overmap* east, overmap* south, +void overmap::generate(game * /*g*/, overmap* north, overmap* east, overmap* south, overmap* west) { erase(); @@ -793,7 +793,7 @@ std::vector overmap::find_all(point origin, oter_id type, int type_range, return res; } -std::vector overmap::find_terrain(std::string term, int cursx, int cursy) +std::vector overmap::find_terrain(std::string term, int /*cursx*/, int /*cursy*/) { std::vector found; for (int x = 0; x < OMAPX; x++) { @@ -907,7 +907,7 @@ void overmap::draw(WINDOW *w, game *g, int &cursx, int &cursy, if (omx >= 0 && omx < OMAPX && omy >= 0 && omy < OMAPY) { // It's in-bounds cur_ter = ter(omx, omy); see = seen(omx, omy); - if (note_here = has_note(omx, omy)) + if (note_here == has_note(omx, omy)) note_text = note(omx, omy); for (int n = 0; n < npcs.size(); n++) { if ((npcs[n].mapx + 1) / 2 == omx && (npcs[n].mapy + 1) / 2 == omy) { @@ -926,7 +926,7 @@ void overmap::draw(WINDOW *w, game *g, int &cursx, int &cursy, omy += (omy < 0 ? OMAPY : 0 - OMAPY); cur_ter = diag.ter(omx, omy); see = diag.seen(omx, omy); - if ((note_here = diag.has_note(omx, omy))) + if ((note_here == diag.has_note(omx, omy))) note_text = diag.note(omx, omy); } else { cur_ter = hori.ter(omx, omy); @@ -940,7 +940,7 @@ void overmap::draw(WINDOW *w, game *g, int &cursx, int &cursy, omy += (omy < 0 ? OMAPY : 0 - OMAPY); cur_ter = diag.ter(omx, omy); see = diag.seen(omx, omy); - if (note_here = diag.has_note(omx, omy)) + if (note_here == diag.has_note(omx, omy)) note_text = diag.note(omx, omy); } else { cur_ter = hori.ter(omx, omy); diff --git a/player.cpp b/player.cpp index 3b60d6f679529..c4e6dcdc36439 100644 --- a/player.cpp +++ b/player.cpp @@ -3672,8 +3672,8 @@ int player::amount_of(itype_id it) if (it == itm_toolset && has_bionic(bio_tools)) return 1; if (it == itm_apparatus) { - if (has_amount(itm_crackpipe, 1) && has_amount(itm_lighter, 1) || - (has_amount(itm_can_drink, 1) && has_amount(itm_lighter, 1))) + if ((has_amount(itm_crackpipe, 1) && has_amount(itm_lighter, 1)) || + ((has_amount(itm_can_drink, 1) && has_amount(itm_lighter, 1)))) return 1; } int quantity = 0; diff --git a/player.h b/player.h index 8cb55ae29de6e..c0a1e5cbce3c0 100644 --- a/player.h +++ b/player.h @@ -17,8 +17,8 @@ class monster; class game; -class trap; -class mission; +struct trap; +struct mission; struct special_attack { diff --git a/rng.cpp b/rng.cpp index adf5b2c00cd2a..932f2a3040b69 100644 --- a/rng.cpp +++ b/rng.cpp @@ -33,7 +33,7 @@ int dice(int number, int sides) int djb2_hash(unsigned char *str){ unsigned long hash = 5381; int c; - while (c = *str++) + while (c == *str++) hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ return hash; } diff --git a/settlement.cpp b/settlement.cpp index c9d69404f4241..195274b491cf1 100644 --- a/settlement.cpp +++ b/settlement.cpp @@ -39,7 +39,7 @@ void settlement::set_population() pop = 4; } -int settlement::num(oter_id ter) +int settlement::num(oter_id /*ter*/) { return -1; /* @@ -52,7 +52,7 @@ int settlement::num(oter_id ter) */ } -void settlement::add_building(oter_id ter) +void settlement::add_building(oter_id /*ter*/) { return; /* diff --git a/texthash.cpp b/texthash.cpp index 4036a0c27d996..31db6e78073f7 100644 --- a/texthash.cpp +++ b/texthash.cpp @@ -23,7 +23,7 @@ std::string text_hash::value(std::string key) return fail.str(); } -bool text_hash::has_key(std::string key) +bool text_hash::has_key(std::string /*key*/) { return true; /* diff --git a/tileray.cpp b/tileray.cpp index ec235bacd0429..d3bc9c8491727 100644 --- a/tileray.cpp +++ b/tileray.cpp @@ -5,8 +5,8 @@ static const int sx[4] = { 1, -1, -1, 1 }; static const int sy[4] = { 1, 1, -1, -1 }; -tileray::tileray (): deltax(0), deltay(0), direction(0), leftover (0), - last_dx(0), last_dy(0), infinite (false), steps(0) +tileray::tileray (): deltax(0), deltay(0), leftover (0), direction(0), + last_dx(0), last_dy(0), steps(0), infinite (false) { } diff --git a/trapfunc.cpp b/trapfunc.cpp index 102883c07a563..07d06fa924933 100644 --- a/trapfunc.cpp +++ b/trapfunc.cpp @@ -9,13 +9,13 @@ void trapfunc::bubble(game *g, int x, int y) g->m.tr_at(x, y) = tr_null; } -void trapfuncm::bubble(game *g, monster *z, int x, int y) +void trapfuncm::bubble(game *g, monster * /*z*/, int x, int y) { g->sound(x, y, 18, "Pop!"); g->m.tr_at(x, y) = tr_null; } -void trapfuncm::cot(game *g, monster *z, int x, int y) +void trapfuncm::cot(game *g, monster *z, int /*x*/, int /*y*/) { g->add_msg("The zombie stumbles over the cot"); z->moves -= 100; @@ -47,7 +47,7 @@ void trapfuncm::beartrap(game *g, monster *z, int x, int y) z->add_item(beartrap); } -void trapfunc::board(game *g, int x, int y) +void trapfunc::board(game *g, int /*x*/, int /*y*/) { g->add_msg("You step on a spiked board!"); g->u.hit(g, bp_feet, 0, 0, rng(6, 10)); @@ -85,7 +85,7 @@ void trapfunc::tripwire(game *g, int x, int y) g->u.hurtall(rng(1, 4)); } -void trapfuncm::tripwire(game *g, monster *z, int x, int y) +void trapfuncm::tripwire(game *g, monster *z, int /*x*/, int /*y*/) { int t; if (g->u_see(z, t)) @@ -100,7 +100,7 @@ void trapfunc::crossbow(game *g, int x, int y) bool add_bolt = true; g->add_msg("You trigger a crossbow trap!"); if (!one_in(4) && rng(8, 20) > g->u.dodge(g)) { - body_part hit; + body_part hit = body_part(0); switch (rng(1, 10)) { case 1: hit = bp_feet; break; case 2: @@ -153,7 +153,7 @@ void trapfunc::shotgun(game *g, int x, int y) if (g->m.tr_at(x, y) == tr_shotgun_1) shots = 1; if (rng(5, 50) > g->u.dodge(g)) { - body_part hit; + body_part hit = body_part(0); switch (rng(1, 10)) { case 1: hit = bp_feet; break; case 2: @@ -183,7 +183,7 @@ void trapfuncm::shotgun(game *g, monster *z, int x, int y) { int t; bool seen = g->u_see(z, t); - int chance; + int chance = 0; switch (z->type->size) { case MS_TINY: chance = 100; break; case MS_SMALL: chance = 16; break; @@ -207,7 +207,7 @@ void trapfuncm::shotgun(game *g, monster *z, int x, int y) } -void trapfunc::blade(game *g, int x, int y) +void trapfunc::blade(game *g, int /*x*/, int /*y*/) { g->add_msg("A machete swings out and hacks your torso!"); g->u.hit(g, bp_torso, 0, 12, 30); @@ -346,7 +346,7 @@ void trapfuncm::dissector(game *g, monster *z, int x, int y) g->explode_mon(g->mon_at(x, y)); } -void trapfunc::pit(game *g, int x, int y) +void trapfunc::pit(game *g, int /*x*/, int /*y*/) { g->add_msg("You fall in a pit!"); if (g->u.has_trait(PF_WINGS_BIRD)) @@ -386,7 +386,7 @@ void trapfunc::pit_spikes(game *g, int x, int y) else if (rng(5, 30) < dodge) g->add_msg("You avoid the spikes within."); else { - body_part hit; + body_part hit = body_part(0); switch (rng(1, 10)) { case 1: case 2: hit = bp_legs; break; @@ -472,7 +472,7 @@ void trapfuncm::lava(game *g, monster *z, int x, int y) } -void trapfunc::sinkhole(game *g, int x, int y) +void trapfunc::sinkhole(game *g, int /*x*/, int /*y*/) { g->add_msg("You step into a sinkhole, and start to sink down!"); if (g->u.has_amount(itm_rope_30, 1) && @@ -530,7 +530,7 @@ void trapfunc::sinkhole(game *g, int x, int y) } } -void trapfunc::ledge(game *g, int x, int y) +void trapfunc::ledge(game *g, int /*x*/, int /*y*/) { g->add_msg("You fall down a level!"); g->vertical_move(-1, true); @@ -542,7 +542,7 @@ void trapfuncm::ledge(game *g, monster *z, int x, int y) g->kill_mon(g->mon_at(x, y)); } -void trapfunc::temple_flood(game *g, int x, int y) +void trapfunc::temple_flood(game *g, int /*x*/, int /*y*/) { g->add_msg("You step on a loose tile, and water starts to flood the room!"); for (int i = 0; i < SEEX * MAPSIZE; i++) { @@ -589,7 +589,7 @@ void trapfunc::temple_toggle(game *g, int x, int y) } } -void trapfunc::glow(game *g, int x, int y) +void trapfunc::glow(game *g, int /*x*/, int /*y*/) { if (one_in(3)) { g->add_msg("You're bathed in radiation!"); @@ -601,7 +601,7 @@ void trapfunc::glow(game *g, int x, int y) g->add_msg("Small flashes surround you."); } -void trapfuncm::glow(game *g, monster *z, int x, int y) +void trapfuncm::glow(game * /*g*/, monster *z, int /*x*/, int /*y*/) { if (one_in(3)) { z->hurt( rng(5, 10) ); @@ -668,13 +668,13 @@ void trapfunc::shadow(game *g, int x, int y) } } -void trapfunc::drain(game *g, int x, int y) +void trapfunc::drain(game *g, int /*x*/, int /*y*/) { g->add_msg("You feel your life force sapping away."); g->u.hurtall(1); } -void trapfuncm::drain(game *g, monster *z, int x, int y) +void trapfuncm::drain(game * /*g*/, monster *z, int /*x*/, int /*y*/) { z->hurt(1); } @@ -708,7 +708,7 @@ void trapfunc::snake(game *g, int x, int y) g->m.tr_at(x, y) = tr_null; } -void trapfuncm::snake(game *g, monster *z, int x, int y) +void trapfuncm::snake(game *g, monster * /*z*/, int x, int y) { g->sound(x, y, 10, "ssssssss"); if (one_in(6)) diff --git a/tutorial.cpp b/tutorial.cpp index 5ef2180c38e22..036aa2b7695c4 100644 --- a/tutorial.cpp +++ b/tutorial.cpp @@ -112,7 +112,7 @@ void tutorial_game::per_turn(game *g) add_message(g, LESSON_PICKUP); } -void tutorial_game::pre_action(game *g, action_id &act) +void tutorial_game::pre_action(game * /*g*/, action_id & /*act*/) { } diff --git a/veh_interact.cpp b/veh_interact.cpp index 82b7bcef282bf..219107edf229a 100644 --- a/veh_interact.cpp +++ b/veh_interact.cpp @@ -401,7 +401,7 @@ void veh_interact::do_remove(int reason) } } -void veh_interact::do_rename(int reason) +void veh_interact::do_rename(int /*reason*/) { std::string name = string_input_popup("Enter new vehicle name", 20); (veh->name = name); diff --git a/vehicle.cpp b/vehicle.cpp index fe7d899c280ed..508b7e6c05083 100644 --- a/vehicle.cpp +++ b/vehicle.cpp @@ -963,7 +963,7 @@ float vehicle::strain () bool vehicle::valid_wheel_config () { - int x1, y1, x2, y2; + int x1 = 0, y1 = 0, x2 = 0, y2 = 0; int count = 0; for (int i = 0; i < external_parts.size(); i++) { @@ -1177,7 +1177,7 @@ void vehicle::stop () of_turn_carry = 0; } -veh_collision vehicle::part_collision (int vx, int vy, int part, int x, int y) +veh_collision vehicle::part_collision (int /*vx*/, int /*vy*/, int part, int x, int y) { bool pl_ctrl = player_in_control (&g->u); int mondex = g->mon_at(x, y); @@ -1555,7 +1555,7 @@ void vehicle::remove_item (int part, int itemdex) parts[part].items.erase (parts[part].items.begin() + itemdex); } -void vehicle::gain_moves (int mp) +void vehicle::gain_moves (int /*mp*/) { if (velocity) of_turn = 1 + of_turn_carry; diff --git a/vehicle.h b/vehicle.h index fdfb8b6ec2143..74fa751373493 100644 --- a/vehicle.h +++ b/vehicle.h @@ -54,7 +54,7 @@ struct vehicle_part precalc_dx[0] = precalc_dx[1] = -1; precalc_dy[0] = precalc_dy[1] = -1; } - bool has_flag( int flag ) { return flag & flags; } + bool has_flag( int flag ) { return (flag & flags) != 0; } int set_flag( int flag ) { return flags |= flag; } int remove_flag( int flag ) { return flags &= ~flag; } diff --git a/weather.cpp b/weather.cpp index 8be86cc243c3b..68703117f554c 100644 --- a/weather.cpp +++ b/weather.cpp @@ -61,7 +61,7 @@ void weather_effect::thunder(game *g) } } -void weather_effect::lightning(game *g) +void weather_effect::lightning(game * /*g*/) { /* thunder(g); if (one_in(LIGHTNING_CHANCE)) { diff --git a/wish.cpp b/wish.cpp index 30c9193ee50fa..bc2be06abd2c2 100644 --- a/wish.cpp +++ b/wish.cpp @@ -38,7 +38,7 @@ void game::wish() result_selected = 0; shift = search_results[result_selected]; a = 0; - if (shift + 23 > itypes.size()) { + if (unsigned(shift + 23) > itypes.size()) { a = shift + 23 - itypes.size(); shift = itypes.size() - 23; } @@ -51,7 +51,7 @@ void game::wish() result_selected = search_results.size() - 1; shift = search_results[result_selected]; a = 0; - if (shift + 23 > itypes.size()) { + if (unsigned(shift + 23) > itypes.size()) { a = shift + 23 - itypes.size(); shift = itypes.size() - 23; } @@ -62,12 +62,12 @@ void game::wish() } if (search) { - for (int i = 0; i < itypes.size(); i++) { + for (unsigned int i = 0; i < itypes.size(); i++) { if (itypes[i]->name.find(pattern) != std::string::npos) { shift = i; a = 0; result_selected = 0; - if (shift + 23 > itypes.size()) { + if (unsigned(shift + 23) > itypes.size()) { a = shift + 23 - itypes.size(); shift = itypes.size() - 23; } @@ -96,7 +96,7 @@ void game::wish() result_selected = 0; shift = search_results[result_selected]; a = 0; - if (shift + 23 > itypes.size()) { + if (unsigned(shift + 23) > itypes.size()) { a = shift + 23 - itypes.size(); shift = itypes.size() - 23; } @@ -106,7 +106,7 @@ void game::wish() result_selected = search_results.size() - 1; shift = search_results[result_selected]; a = 0; - if (shift + 23 > itypes.size()) { + if (unsigned(shift + 23) > itypes.size()) { a = shift + 23 - itypes.size(); shift = itypes.size() - 23; } From 9ba34d3ebf11e061754efc1d4808a51b698efd60 Mon Sep 17 00:00:00 2001 From: AkrionXxarr Date: Thu, 28 Feb 2013 11:57:55 -0800 Subject: [PATCH 6/6] Further warning resolutions. Specifically focused on signed/unsigned mismatches. Change to warning flags in Makefile. Small error fix. --- Makefile.Windows | 5 +- bionics.cpp | 2 +- construction.cpp | 2 +- faction.cpp | 2 +- help.cpp | 2 +- inventory.cpp | 52 +++++++------- inventory_ui.cpp | 16 ++--- item.cpp | 62 ++++++++-------- iuse.cpp | 14 ++-- lightmap.cpp | 6 +- map.cpp | 58 +++++++-------- mapbuffer.cpp | 8 +-- mapgen.cpp | 24 +++---- melee.cpp | 4 +- mission_end.cpp | 4 +- mission_fail.cpp | 4 +- monattack.cpp | 46 ++++++------ mondeath.cpp | 12 ++-- monmove.cpp | 18 ++--- monster.cpp | 48 ++++++------- mutation.cpp | 28 ++++---- npc.cpp | 52 +++++++------- npcmove.cpp | 28 ++++---- npctalk.cpp | 30 ++++---- output.cpp | 12 ++-- overmap.cpp | 102 +++++++++++++------------- player.cpp | 182 +++++++++++++++++++++++------------------------ ranged.cpp | 22 +++--- texthash.cpp | 4 +- tutorial.cpp | 2 +- veh_interact.cpp | 18 ++--- vehicle.cpp | 86 +++++++++++----------- weather.cpp | 2 +- wish.cpp | 13 ++-- 34 files changed, 486 insertions(+), 484 deletions(-) diff --git a/Makefile.Windows b/Makefile.Windows index 872d7f472db2b..2725bc4b6a462 100644 --- a/Makefile.Windows +++ b/Makefile.Windows @@ -2,7 +2,8 @@ # WARNINGS will spam hundreds of warnings, mostly safe, if turned on # DEBUG is best turned on if you plan to debug in gdb -- please do! # PROFILE is for use with gprof or a similar program -- don't bother generally -#WARNINGS = -Wall -Wextra -Wno-switch -Wno-sign-compare -Wno-missing-braces -Wno-unused-parameter -Wno-char-subscripts + +WARNINGS = -Wall -Wextra DEBUG = -g #PROFILE = -pg OTHERS = -O3 @@ -49,4 +50,4 @@ $(ODIR)/%.o: %.cpp clean: rm -f $(TARGET) $(ODIR)/*.o --include $(SOURCES:%.cpp=$(DEPDIR)/%.P) +-include $(SOURCES:%.cpp=$(DEPDIR)/%.P) \ No newline at end of file diff --git a/bionics.cpp b/bionics.cpp index 0069f66e968a8..0d91f5a7efb80 100644 --- a/bionics.cpp +++ b/bionics.cpp @@ -568,7 +568,7 @@ void bionics_install_failure(game *g, player *u, int success) fail_text += " and "; fail_text += (u->my_bionics.size() <= failure_level ? "all" : "some"); fail_text += " of your existing bionics are lost."; - for (unsigned int i = 0; i < failure_level && u->my_bionics.size() > 0; i++) { + for (int i = 0; i < failure_level && u->my_bionics.size() > 0; i++) { int rem = rng(0, u->my_bionics.size() - 1); u->my_bionics.erase(u->my_bionics.begin() + rem); } diff --git a/construction.cpp b/construction.cpp index 443558742f3be..7bf42e1b302a0 100644 --- a/construction.cpp +++ b/construction.cpp @@ -467,7 +467,7 @@ bool game::player_can_build(player &p, inventory inv, constructable* con, start = level; bool can_build_any = false; - for (unsigned int i = start; i < con->stages.size() && i <= last_level; i++) { + for (int i = start; i < con->stages.size() && i <= last_level; i++) { construction_stage stage = con->stages[i]; bool has_tool = false; bool has_component = false; diff --git a/faction.cpp b/faction.cpp index 2412d2bc3f7d2..4d0aacae779d0 100644 --- a/faction.cpp +++ b/faction.cpp @@ -74,7 +74,7 @@ std::string faction::save_info() good << " " << omx << " " << omy << " " << mapx << " " << mapy << " " << size << " " << power << " "; dump << opinion_of.size() << " "; - for (int i = 0; i < opinion_of.size(); i++) + for (unsigned int i = 0; i < opinion_of.size(); i++) dump << opinion_of[i] << " "; dump << name; return dump.str(); diff --git a/help.cpp b/help.cpp index 6f47be29ea02b..c93275d77673e 100644 --- a/help.cpp +++ b/help.cpp @@ -468,7 +468,7 @@ from frostbite and to keep your distance from large fires."); if (keys.empty()) printz(c_red, "Unbound!"); else { - for (int j = 0; j < keys.size(); j++) { + for (unsigned int j = 0; j < keys.size(); j++) { printz(c_yellow, "%c", keys[j]); if (j < keys.size() - 1) printz(c_white, " or "); diff --git a/inventory.cpp b/inventory.cpp index cd0c1963d4a9d..7ae27d8e46676 100644 --- a/inventory.cpp +++ b/inventory.cpp @@ -39,7 +39,7 @@ std::vector inventory::as_vector() { std::vector ret; for (int i = 0; i < size(); i++) { - for (int j = 0; j < stack_at(i).size(); j++) + for (unsigned int j = 0; j < stack_at(i).size(); j++) ret.push_back(items[i][j]); } return ret; @@ -53,7 +53,7 @@ int inventory::size() const int inventory::num_items() const { int ret = 0; - for (int i = 0; i < items.size(); i++) + for (unsigned int i = 0; i < items.size(); i++) ret += items[i].size(); return ret; @@ -90,7 +90,7 @@ inventory& inventory::operator+= (const inventory &rhs) inventory& inventory::operator+= (const std::vector &rhs) { - for (int i = 0; i < rhs.size(); i++) + for (unsigned int i = 0; i < rhs.size(); i++) add_item(rhs[i]); return *this; } @@ -123,7 +123,7 @@ void inventory::clear() void inventory::add_stack(const std::vector newits) { - for (int i = 0; i < newits.size(); i++) + for (unsigned int i = 0; i < newits.size(); i++) add_item(newits[i], true); } @@ -139,7 +139,7 @@ void inventory::add_item(item newit, bool keep_invlet) if (newit.is_style()) return; // Styles never belong in our inventory. - for (int i = 0; i < items.size(); i++) { + for (unsigned int i = 0; i < items.size(); i++) { if (items[i][0].stacks_with(newit)) { newit.invlet = items[i][0].invlet; items[i].push_back(newit); @@ -169,7 +169,7 @@ void inventory::restack(player *p) { inventory tmp; for (int i = 0; i < size(); i++) { - for (int j = 0; j < items[i].size(); j++) + for (unsigned int j = 0; j < items[i].size(); j++) tmp.add_item(items[i][j]); } clear(); @@ -178,7 +178,7 @@ void inventory::restack(player *p) if (!tmp[i].invlet_is_okay() || p->has_weapon_or_armor(tmp[i].invlet)) { //debugmsg("Restacking item %d (invlet %c)", i, tmp[i].invlet); tmp.assign_empty_invlet(tmp[i], p); - for (int j = 1; j < tmp.stack_at(i).size(); j++) + for (unsigned int j = 1; j < tmp.stack_at(i).size(); j++) tmp.stack_at(i)[j].invlet = tmp[i].invlet; } } @@ -192,7 +192,7 @@ void inventory::form_from_map(game *g, point origin, int range) items.clear(); for (int x = origin.x - range; x <= origin.x + range; x++) { for (int y = origin.y - range; y <= origin.y + range; y++) { - for (int i = 0; i < g->m.i_at(x, y).size(); i++) + for (unsigned int i = 0; i < g->m.i_at(x, y).size(); i++) if (!g->m.i_at(x, y)[i].made_of(LIQUID)) add_item(g->m.i_at(x, y)[i]); // Kludges for now! @@ -260,7 +260,7 @@ item inventory::remove_item(int stack, int index) item inventory::remove_item_by_letter(char ch) { - for (int i = 0; i < items.size(); i++) { + for (unsigned int i = 0; i < items.size(); i++) { if (items[i][0].invlet == ch) { if (items[i].size() > 1) items[i][1].invlet = ch; @@ -290,7 +290,7 @@ item inventory::remove_item_by_quantity(int index, int quantity) item& inventory::item_by_letter(char ch) { - for (int i = 0; i < items.size(); i++) { + for (unsigned int i = 0; i < items.size(); i++) { if (items[i][0].invlet == ch) return items[i][0]; } @@ -301,7 +301,7 @@ int inventory::index_by_letter(char ch) { if (ch == KEY_ESCAPE) return -1; - for (int i = 0; i < items.size(); i++) { + for (unsigned int i = 0; i < items.size(); i++) { if (items[i][0].invlet == ch) return i; } @@ -311,8 +311,8 @@ int inventory::index_by_letter(char ch) int inventory::amount_of(itype_id it) { int count = 0; - for (int i = 0; i < items.size(); i++) { - for (int j = 0; j < items[i].size(); j++) { + for (unsigned int i = 0; i < items.size(); i++) { + for (unsigned int j = 0; j < items[i].size(); j++) { if (items[i][j].type->id == it) { // check if it's a container, if so, it should be empty @@ -322,7 +322,7 @@ int inventory::amount_of(itype_id it) count++; } else count++; } - for (int k = 0; k < items[i][j].contents.size(); k++) { + for (unsigned int k = 0; k < items[i][j].contents.size(); k++) { if (items[i][j].contents[k].type->id == it) count++; } @@ -334,15 +334,15 @@ int inventory::amount_of(itype_id it) int inventory::charges_of(itype_id it) { int count = 0; - for (int i = 0; i < items.size(); i++) { - for (int j = 0; j < items[i].size(); j++) { + for (unsigned int i = 0; i < items.size(); i++) { + for (unsigned int j = 0; j < items[i].size(); j++) { if (items[i][j].type->id == it) { if (items[i][j].charges < 0) count++; else count += items[i][j].charges; } - for (int k = 0; k < items[i][j].contents.size(); k++) { + for (unsigned int k = 0; k < items[i][j].contents.size(); k++) { if (items[i][j].contents[k].type->id == it) { if (items[i][j].contents[k].charges < 0) count++; @@ -357,11 +357,11 @@ int inventory::charges_of(itype_id it) void inventory::use_amount(itype_id it, int quantity, bool use_container) { - for (int i = 0; i < items.size() && quantity > 0; i++) { - for (int j = 0; j < items[i].size() && quantity > 0; j++) { + for (unsigned int i = 0; i < items.size() && quantity > 0; i++) { + for (unsigned int j = 0; j < items[i].size() && quantity > 0; j++) { // First, check contents bool used_item_contents = false; - for (int k = 0; k < items[i][j].contents.size() && quantity > 0; k++) { + for (unsigned int k = 0; k < items[i][j].contents.size() && quantity > 0; k++) { if (items[i][j].contents[k].type->id == it) { quantity--; items[i][j].contents.erase(items[i][j].contents.begin() + k); @@ -394,10 +394,10 @@ void inventory::use_amount(itype_id it, int quantity, bool use_container) void inventory::use_charges(itype_id it, int quantity) { - for (int i = 0; i < items.size() && quantity > 0; i++) { - for (int j = 0; j < items[i].size() && quantity > 0; j++) { + for (unsigned int i = 0; i < items.size() && quantity > 0; i++) { + for (unsigned int j = 0; j < items[i].size() && quantity > 0; j++) { // First, check contents - for (int k = 0; k < items[i][j].contents.size() && quantity > 0; k++) { + for (unsigned int k = 0; k < items[i][j].contents.size() && quantity > 0; k++) { if (items[i][j].contents[k].type->id == it) { if (items[i][j].contents[k].charges <= quantity) { quantity -= items[i][j].contents[k].charges; @@ -447,11 +447,11 @@ bool inventory::has_charges(itype_id it, int quantity) bool inventory::has_item(item *it) { - for (int i = 0; i < items.size(); i++) { - for (int j = 0; j < items[i].size(); j++) { + for (unsigned int i = 0; i < items.size(); i++) { + for (unsigned int j = 0; j < items[i].size(); j++) { if (it == &(items[i][j])) return true; - for (int k = 0; k < items[i][j].contents.size(); k++) { + for (unsigned int k = 0; k < items[i][j].contents.size(); k++) { if (it == &(items[i][j].contents[k])) return true; } diff --git a/inventory_ui.cpp b/inventory_ui.cpp index 30fdf9dea8728..a67b07418d5ed 100644 --- a/inventory_ui.cpp +++ b/inventory_ui.cpp @@ -43,7 +43,7 @@ void print_inv_statics(game *g, WINDOW* w_inv, std::string title, // Print our weapon mvwprintz(w_inv, 2, 45, c_magenta, "WEAPON:"); int dropping_weapon = false; - for (int i = 0; i < dropped_items.size() && !dropping_weapon; i++) { + for (unsigned int i = 0; i < dropped_items.size() && !dropping_weapon; i++) { if (dropped_items[i] == g->u.weapon.invlet) dropping_weapon = true; } @@ -62,9 +62,9 @@ void print_inv_statics(game *g, WINDOW* w_inv, std::string title, // Print worn items if (g->u.worn.size() > 0) mvwprintz(w_inv, 5, 45, c_magenta, "ITEMS WORN:"); - for (int i = 0; i < g->u.worn.size(); i++) { + for (unsigned int i = 0; i < g->u.worn.size(); i++) { bool dropping_armor = false; - for (int j = 0; j < dropped_items.size() && !dropping_armor; j++) { + for (unsigned int j = 0; j < dropped_items.size() && !dropping_armor; j++) { if (dropped_items[j] == g->u.worn[i].invlet) dropping_armor = true; } @@ -375,7 +375,7 @@ std::vector game::multidrop() int index = u.inv.index_by_letter(ch); if (index == -1) { // Not from inventory int found = false; - for (int i = 0; i < weapon_and_armor.size() && !found; i++) { + for (unsigned int i = 0; i < weapon_and_armor.size() && !found; i++) { if (weapon_and_armor[i] == ch) { weapon_and_armor.erase(weapon_and_armor.begin() + i); found = true; @@ -472,7 +472,7 @@ std::vector game::multidrop() current_stack++; } - for (int i = 0; i < weapon_and_armor.size(); i++) + for (unsigned int i = 0; i < weapon_and_armor.size(); i++) ret.push_back(u.i_rem(weapon_and_armor[i])); return ret; @@ -508,7 +508,7 @@ void game::compare(int iCompareX, int iCompareY) std::vector grounditems; //Filter out items with the same name (keep only one of them) std::map dups; - for (int i = 0; i < here.size(); i++) { + for (unsigned int i = 0; i < here.size(); i++) { if (!dups[here[i].tname(this).c_str()]) { grounditems.push_back(here[i]); dups[here[i].tname(this).c_str()] = true; @@ -534,7 +534,7 @@ void game::compare(int iCompareX, int iCompareY) if (groundsize > 0) { firsts.push_back(0); } - for (int i = 0; i < first.size(); i++) { + for (unsigned int i = 0; i < first.size(); i++) { firsts.push_back((first[i] >= 0) ? first[i]+groundsize : -1); } ch = '.'; @@ -602,7 +602,7 @@ void game::compare(int iCompareX, int iCompareY) int index = u.inv.index_by_letter(ch); if (index == -1) { // Not from inventory bool found = false; - for (int i = 0; i < weapon_and_armor.size() && !found; i++) { + for (unsigned int i = 0; i < weapon_and_armor.size() && !found; i++) { if (weapon_and_armor[i] == ch) { weapon_and_armor.erase(weapon_and_armor.begin() + i); found = true; diff --git a/item.cpp b/item.cpp index ba95a1bf7be7d..a5c8a63f81d70 100644 --- a/item.cpp +++ b/item.cpp @@ -230,7 +230,7 @@ bool item::stacks_with(item rhs) if(bigness != rhs.bigness) return false; - for (int i = 0; i < contents.size() && stacks; i++) + for (unsigned int i = 0; i < contents.size() && stacks; i++) stacks &= contents[i].stacks_with(rhs.contents[i]); return stacks; @@ -473,7 +473,7 @@ std::string item::info(bool showtext, std::vector *dump) dump->push_back(iteminfo("GUN", "\n")); //dump << "\n"; temp1.str(""); - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) temp1 << "\n+" << contents[i].tname(); dump->push_back(iteminfo("GUN", temp1.str())); // @@ -585,7 +585,7 @@ std::string item::info(bool showtext, std::vector *dump) it_style* style = dynamic_cast(type); //dump << "\n"; - for (int i = 0; i < style->moves.size(); i++) { + for (unsigned int i = 0; i < style->moves.size(); i++) { dump->push_back(iteminfo("STYLE", default_technique_name(style->moves[i].tech), ". Requires Unarmed Skill of ", int(style->moves[i].level))); //dump << default_technique_name(style->moves[i].tech) << ". Requires Unarmed Skill of " << style->moves[i].level << "\n"; } @@ -607,7 +607,7 @@ std::string item::info(bool showtext, std::vector *dump) dump->push_back(iteminfo("DESCRIPTION", type->description)); if (contents.size() > 0) { if (is_gun()) { - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) dump->push_back(iteminfo("DESCRIPTION", contents[i].type->description)); //dump << "\n " << contents[i].type->description; } else @@ -619,7 +619,7 @@ std::string item::info(bool showtext, std::vector *dump) temp1.str(""); std::vector& vecData = *dump; // vector is not copied here - for (int i = 0; i < vecData.size(); i++) { + for (unsigned int i = 0; i < vecData.size(); i++) { if (vecData[i].sType == "DESCRIPTION") temp1 << "\n"; @@ -783,7 +783,7 @@ std::string item::tname(game *g) if (is_gun() && contents.size() > 0 ) { ret << type->name; - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) ret << "+"; } else if (contents.size() == 1) ret << type->name << " of " << contents[0].tname(); @@ -824,7 +824,7 @@ int item::price() return 0; int ret = type->price; - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) ret += contents[i].price(); return ret; } @@ -857,7 +857,7 @@ int item::weight() ret /= 100; } - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) if (contents[i].made_of(LIQUID)) { if (contents[i].type->is_food()) @@ -902,7 +902,7 @@ int item::volume() } if (is_gun()) { - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) ret += contents[i].volume(); } return ret; @@ -911,7 +911,7 @@ int item::volume() int item::volume_contained() { int ret = 0; - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) ret += contents[i].volume(); return ret; } @@ -932,7 +932,7 @@ int item::damage_bash() int item::damage_cut() { if (is_gun()) { - for (int i = 0; i < contents.size(); i++) { + for (unsigned int i = 0; i < contents.size(); i++) { if (contents[i].typeId() == itm_bayonet) return contents[i].type->melee_cut; } @@ -950,7 +950,7 @@ bool item::has_flag(item_flag f) if( gunmod != NULL ) return gunmod->has_flag(f); } else { - for (int i = 0; i < contents.size(); i++) { + for (unsigned int i = 0; i < contents.size(); i++) { // Don't report flags from active gunmods for the gun. if (contents[i].has_flag(f) && contents[i].has_flag(IF_MODE_AUX)) return true; @@ -966,7 +966,7 @@ bool item::has_technique(technique_id tech, player *p) { if (is_style()) { it_style *style = dynamic_cast(type); - for (int i = 0; i < style->moves.size(); i++) { + for (unsigned int i = 0; i < style->moves.size(); i++) { if (style->moves[i].tech == tech && (!p || p->skillLevel("unarmed") >= style->moves[i].level)) return true; @@ -981,7 +981,7 @@ int item::has_gunmod(int type) { if (!is_gun()) return -1; - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) if (contents[i].is_gunmod() && contents[i].typeId() == type) return i; return -1; @@ -1114,7 +1114,7 @@ style_move item::style_data(technique_id tech) it_style* style = dynamic_cast(type); - for (int i = 0; i < style->moves.size(); i++) { + for (unsigned int i = 0; i < style->moves.size(); i++) { if (style->moves[i].tech == tech) return style->moves[i]; } @@ -1390,7 +1390,7 @@ int item::reload_time(player &u) item* item::active_gunmod() { if( mode == IF_MODE_AUX ) - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) if (contents[i].is_gunmod() && contents[i].mode == IF_MODE_AUX) return &contents[i]; return NULL; @@ -1404,7 +1404,7 @@ void item::next_mode() mode = IF_MODE_BURST; else // Enable the first mod with an AUX firing mode. - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) if (contents[i].is_gunmod() && contents[i].has_flag(IF_MODE_AUX)) { mode = IF_MODE_AUX; contents[i].mode = IF_MODE_AUX; @@ -1414,7 +1414,7 @@ void item::next_mode() break; case IF_MODE_BURST: // Enable the first mod with an AUX firing mode. - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) if (contents[i].is_gunmod() && contents[i].has_flag(IF_MODE_AUX)) { mode = IF_MODE_AUX; contents[i].mode = IF_MODE_AUX; @@ -1425,7 +1425,7 @@ void item::next_mode() break; case IF_MODE_AUX: { - int i = 0; + unsigned int i = 0; // Advance to next aux mode, or if there isn't one, normal mode for (; i < contents.size(); i++) if (contents[i].is_gunmod() && contents[i].mode == IF_MODE_AUX) { @@ -1453,7 +1453,7 @@ int item::clip_size() it_gun* gun = dynamic_cast(type); int ret = gun->clip; - for (int i = 0; i < contents.size(); i++) { + for (unsigned int i = 0; i < contents.size(); i++) { if (contents[i].is_gunmod() && !contents[i].has_flag(IF_MODE_AUX)) { int bonus = (ret * (dynamic_cast(contents[i].type))->clip) / 100; ret = int(ret + bonus); @@ -1468,7 +1468,7 @@ int item::accuracy() return 0; it_gun* gun = dynamic_cast(type); int ret = gun->accuracy; - for (int i = 0; i < contents.size(); i++) { + for (unsigned int i = 0; i < contents.size(); i++) { if (contents[i].is_gunmod()) ret -= (dynamic_cast(contents[i].type))->accuracy; } @@ -1493,7 +1493,7 @@ int item::gun_damage(bool with_ammo) int ret = gun->dmg_bonus; if (with_ammo && curammo != NULL) ret += curammo->damage; - for (int i = 0; i < contents.size(); i++) { + for (unsigned int i = 0; i < contents.size(); i++) { if (contents[i].is_gunmod()) ret += (dynamic_cast(contents[i].type))->damage; } @@ -1517,7 +1517,7 @@ int item::noise() ret += 20; if(mode == IF_MODE_AUX) return ret; - for (int i = 0; i < contents.size(); i++) { + for (unsigned int i = 0; i < contents.size(); i++) { if (contents[i].is_gunmod()) ret += (dynamic_cast(contents[i].type))->loudness; } @@ -1533,7 +1533,7 @@ int item::burst_size() return 1; it_gun* gun = dynamic_cast(type); int ret = gun->burst; - for (int i = 0; i < contents.size(); i++) { + for (unsigned int i = 0; i < contents.size(); i++) { if (contents[i].is_gunmod()) ret += (dynamic_cast(contents[i].type))->burst; } @@ -1558,7 +1558,7 @@ int item::recoil(bool with_ammo) int ret = gun->recoil; if (with_ammo && curammo) ret += curammo->recoil; - for (int i = 0; i < contents.size(); i++) { + for (unsigned int i = 0; i < contents.size(); i++) { if (contents[i].is_gunmod()) ret += (dynamic_cast(contents[i].type))->recoil; } @@ -1601,7 +1601,7 @@ ammotype item::ammo_type() if (is_gun()) { it_gun* gun = dynamic_cast(type); ammotype ret = gun->ammo; - for (int i = 0; i < contents.size(); i++) { + for (unsigned int i = 0; i < contents.size(); i++) { if (contents[i].is_gunmod() && !contents[i].has_flag(IF_MODE_AUX)) { it_gunmod* mod = dynamic_cast(contents[i].type); if (mod->newtype != AT_NULL) @@ -1649,18 +1649,18 @@ int item::pick_reload_ammo(player &u, bool interactive) if (charges < clip_size() || (has_spare_mag != -1 && contents[has_spare_mag].charges < tmp->clip)) { std::vector tmpammo = u.has_ammo(ammo_type()); - for (int i = 0; i < tmpammo.size(); i++) + for (unsigned int i = 0; i < tmpammo.size(); i++) if (charges <= 0 || u.inv[tmpammo[i]].typeId() == curammo->id) am.push_back(tmpammo[i]); } // ammo for gun attachments (shotgun attachments, grenade attachments, etc.) // for each attachment, find its associated ammo & append it to the ammo vector - for (int i = 0; i < contents.size(); i++) + for (unsigned int i = 0; i < contents.size(); i++) if (contents[i].is_gunmod() && contents[i].has_flag(IF_MODE_AUX) && contents[i].charges < (dynamic_cast(contents[i].type))->clip) { std::vector tmpammo = u.has_ammo((dynamic_cast(contents[i].type))->newtype); - for(int j = 0; j < tmpammo.size(); j++) + for(unsigned int j = 0; j < tmpammo.size(); j++) if (contents[i].charges <= 0 || u.inv[tmpammo[j]].typeId() == contents[i].curammo->id) am.push_back(tmpammo[j]); @@ -1678,7 +1678,7 @@ int item::pick_reload_ammo(player &u, bool interactive) it_ammo* ammo_type; mvwprintw(w_ammo, 0, 0, "\ Choose ammo type: Damage Armor Pierce Range Accuracy"); - for (int i = 0; i < am.size(); i++) { + for (unsigned int i = 0; i < am.size(); i++) { ammo_type = dynamic_cast(u.inv[am[i]].type); mvwaddch(w_ammo, i + 1, 1, i + 'a'); mvwprintw(w_ammo, i + 1, 3, "%s (%d)", u.inv[am[i]].tname().c_str(), @@ -1750,7 +1750,7 @@ bool item::reload(player &u, int index) reload_target = &contents[spare_mag]; // Finally consider other gunmods } else { - for (int i = 0; i < contents.size(); i++) { + for (unsigned int i = 0; i < contents.size(); i++) { if (&contents[i] != gunmod && i != spare_mag && contents[i].is_gunmod() && contents[i].has_flag(IF_MODE_AUX) && contents[i].ammo_type() == ammo_to_use->ammo_type() && (contents[i].charges <= (dynamic_cast(contents[i].type))->clip || diff --git a/iuse.cpp b/iuse.cpp index 4a2f77ee7cb92..298a93e6f6136 100644 --- a/iuse.cpp +++ b/iuse.cpp @@ -408,7 +408,7 @@ void iuse::alcohol(game *g, player *p, item * /*it*/, bool /*t*/) p->add_disease(DI_DRUNK, duration, g); } -void iuse::cig(game *g, player *p, item * /*it*/, bool /*t*/) +void iuse::cig(game *g, player *p, item *it, bool /*t*/) { if (it->type->id == itm_cig) g->add_msg_if_player(p,"You light a cigarette and smoke it."); @@ -1106,7 +1106,7 @@ void iuse::two_way_radio(game *g, player *p, item *it, bool /*t*/) } else if (ch == '3') { // General S.O.S. p->moves -= 150; std::vector in_range; - for (int i = 0; i < g->cur_om.npcs.size(); i++) { + for (unsigned int i = 0; i < g->cur_om.npcs.size(); i++) { if (g->cur_om.npcs[i].op_of_u.value >= 4 && rl_dist(g->levx, g->levy, g->cur_om.npcs[i].mapx, g->cur_om.npcs[i].mapy) <= 30) @@ -1143,7 +1143,7 @@ void iuse::radio_on(game *g, player *p, item *it, bool t) if (t) { // Normal use int best_signal = 0; std::string message = "Radio: Kssssssssssssh."; - for (int k = 0; k < g->cur_om.radios.size(); k++) { + for (unsigned int k = 0; k < g->cur_om.radios.size(); k++) { int signal = g->cur_om.radios[k].strength - rl_dist(g->cur_om.radios[k].x, g->cur_om.radios[k].y, g->levx, g->levy); @@ -1153,7 +1153,7 @@ void iuse::radio_on(game *g, player *p, item *it, bool t) } } if (best_signal > 0) { - for (int j = 0; j < message.length(); j++) { + for (unsigned int j = 0; j < message.length(); j++) { if (dice(10, 100) > dice(10, best_signal * 3)) { if (!one_in(10)) message[j] = '#'; @@ -2283,7 +2283,7 @@ void iuse::vortex(game *g, player *p, item *it, bool /*t*/) void iuse::dog_whistle(game *g, player *p, item * /*it*/, bool /*t*/) { g->add_msg_if_player(p,"You blow your dog whistle."); - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { if (g->z[i].friendly != 0 && g->z[i].type->id == mon_dog) { int linet; bool u_see = g->u_see(&(g->z[i]), linet); @@ -2312,7 +2312,7 @@ void iuse::vacutainer(game *g, player *p, item *it, bool /*t*/) item blood(g->itypes[itm_blood], g->turn); bool drew_blood = false; - for (int i = 0; i < g->m.i_at(p->posx, p->posy).size() && !drew_blood; i++) { + for (unsigned int i = 0; i < g->m.i_at(p->posx, p->posy).size() && !drew_blood; i++) { item *it = &(g->m.i_at(p->posx, p->posy)[i]); if (it->type->id == itm_corpse && query_yn("Draw blood from %s?", it->tname().c_str())) { @@ -3305,7 +3305,7 @@ void iuse::artifact(game *g, player *p, item *it, bool /*t*/) } break; case AEA_HURTALL: - for (int i = 0; i < g->z.size(); i++) + for (unsigned int i = 0; i < g->z.size(); i++) g->z[i].hurt(rng(0, 5)); break; diff --git a/lightmap.cpp b/lightmap.cpp index 487f9f5db9435..ff85c4829e960 100644 --- a/lightmap.cpp +++ b/lightmap.cpp @@ -420,14 +420,14 @@ void light_map::build_light_cache(game* g, int cx, int cy) } // Check for critters and cache - for (int i = 0; i < g->z.size(); ++i) + for (unsigned int i = 0; i < g->z.size(); ++i) if (INBOUNDS(g->z[i].posx - cx, g->z[i].posy - cy)) c[g->z[i].posx - cx + LIGHTMAP_RANGE_X][g->z[i].posy - cy + LIGHTMAP_RANGE_Y].mon = i; // Check for vehicles and cache VehicleList vehs = g->m.get_vehicles(cx - LIGHTMAP_RANGE_X, cy - LIGHTMAP_RANGE_Y, cx + LIGHTMAP_RANGE_X, cy + LIGHTMAP_RANGE_Y); - for(int v = 0; v < vehs.size(); ++v) { - for(int p = 0; p < vehs[v].v->parts.size(); ++p) { + for(unsigned int v = 0; v < vehs.size(); ++v) { + for(unsigned int p = 0; p < vehs[v].v->parts.size(); ++p) { int px = vehs[v].x + vehs[v].v->parts[p].precalc_dx[0] - cx; int py = vehs[v].y + vehs[v].v->parts[p].precalc_dy[0] - cy; diff --git a/map.cpp b/map.cpp index 4fcb082f8f7dc..4847218b4f2b7 100644 --- a/map.cpp +++ b/map.cpp @@ -75,7 +75,7 @@ VehicleList map::get_vehicles(const int sx, const int sy, const int ex, const in if (nonant < 0 || nonant >= my_MAPSIZE * my_MAPSIZE) continue; // out of grid - for(int i = 0; i < grid[nonant]->vehicles.size(); ++i) { + for(unsigned int i = 0; i < grid[nonant]->vehicles.size(); ++i) { wrapped_vehicle w; w.v = grid[nonant]->vehicles[i]; w.x = w.v->posx + cx * SEEX; @@ -263,7 +263,7 @@ void map::destroy_vehicle (vehicle *veh) return; } const int sm = veh->smx + veh->smy * my_MAPSIZE; - for (int i = 0; i < grid[sm]->vehicles.size(); i++) { + for (unsigned int i = 0; i < grid[sm]->vehicles.size(); i++) { if (grid[sm]->vehicles[i] == veh) { vehicle_list.erase(veh); reset_vehicle_cache(); @@ -302,7 +302,7 @@ bool map::displace_vehicle (game *g, int &x, int &y, const int dx, const int dy, // first, let's find our position in current vehicles vector int our_i = -1; - for (int i = 0; i < grid[src_na]->vehicles.size(); i++) { + for (unsigned int i = 0; i < grid[src_na]->vehicles.size(); i++) { if (grid[src_na]->vehicles[i]->posx == srcx && grid[src_na]->vehicles[i]->posy == srcy) { our_i = i; @@ -325,7 +325,7 @@ bool map::displace_vehicle (game *g, int &x, int &y, const int dx, const int dy, // record every passenger inside std::vector psg_parts = veh->boarded_parts(); std::vector psgs; - for (int p = 0; p < psg_parts.size(); p++) + for (unsigned int p = 0; p < psg_parts.size(); p++) psgs.push_back (veh->get_passenger (psg_parts[p])); const int rec = abs(veh->velocity) / 5 / 100; @@ -333,7 +333,7 @@ bool map::displace_vehicle (game *g, int &x, int &y, const int dx, const int dy, bool need_update = false; int upd_x, upd_y; // move passengers - for (int i = 0; i < psg_parts.size(); i++) { + for (unsigned int i = 0; i < psg_parts.size(); i++) { player *psg = psgs[i]; const int p = psg_parts[i]; if (!psg) { @@ -358,7 +358,7 @@ bool map::displace_vehicle (game *g, int &x, int &y, const int dx, const int dy, upd_y = psg->posy; } } - for (int p = 0; p < veh->parts.size(); p++) { + for (unsigned int p = 0; p < veh->parts.size(); p++) { veh->parts[p].precalc_dx[0] = veh->parts[p].precalc_dx[1]; veh->parts[p].precalc_dy[0] = veh->parts[p].precalc_dy[1]; } @@ -404,7 +404,7 @@ void map::vehmove(game *g) // give vehicles movement points { VehicleList vehs = g->m.get_vehicles(); - for(int v = 0; v < vehs.size(); ++v) { + for(unsigned int v = 0; v < vehs.size(); ++v) { vehicle* veh = vehs[v].v; veh->gain_moves (abs (veh->velocity)); } @@ -426,7 +426,7 @@ bool map::vehproceed(game* g){ vehicle* veh = NULL; float max_of_turn = 0; int x; int y; - for(int v = 0; v < vehs.size(); ++v) { + for(unsigned int v = 0; v < vehs.size(); ++v) { if(vehs[v].v->of_turn > max_of_turn){ veh = vehs[v].v; x = vehs[v].x; @@ -467,7 +467,7 @@ bool map::vehproceed(game* g){ { // sink in water? int num_wheels = 0, submerged_wheels = 0; - for (int ep = 0; ep < veh->external_parts.size(); ep++) { + for (unsigned int ep = 0; ep < veh->external_parts.size(); ep++) { const int p = veh->external_parts[ep]; if (veh->part_flag(p, vpf_wheel)){ num_wheels++; @@ -505,7 +505,7 @@ bool map::vehproceed(game* g){ // if not enough wheels, mess up the ground a bit. if (!veh->valid_wheel_config()) { veh->velocity += veh->velocity < 0 ? 2000 : -2000; - for (int ep = 0; ep < veh->external_parts.size(); ep++) { + for (unsigned int ep = 0; ep < veh->external_parts.size(); ep++) { const int p = veh->external_parts[ep]; const int px = x + veh->parts[p].precalc_dx[0]; const int py = y + veh->parts[p].precalc_dy[0]; @@ -546,7 +546,7 @@ bool map::vehproceed(game* g){ if (veh->velocity == 0) can_move = false; // find collisions - for (int ep = 0; ep < veh->external_parts.size() && can_move; ep++) { + for (unsigned int ep = 0; ep < veh->external_parts.size() && can_move; ep++) { const int p = veh->external_parts[ep]; // coords of where part will go due to movement (dx/dy) // and turning (precalc_dx/dy [1]) @@ -621,7 +621,7 @@ bool map::vehproceed(game* g){ veh->damage_all(imp / 20, imp / 10, 1);// shake veh because of collision std::vector ppl = veh->boarded_parts(); const int vel2 = imp * k_mvel * 100 / (veh->total_mass() / 8); - for (int ps = 0; ps < ppl.size(); ps++) { + for (unsigned int ps = 0; ps < ppl.size(); ps++) { player *psg = veh->get_passenger (ppl[ps]); if (!psg) { debugmsg ("throw passenger: empty passenger at part %d", ppl[ps]); @@ -674,7 +674,7 @@ bool map::vehproceed(game* g){ // after displacement veh reference would be invdalid. // damn references! if (can_move) { - for (int ep = 0; ep < veh->external_parts.size(); ep++) { + for (unsigned int ep = 0; ep < veh->external_parts.size(); ep++) { const int p = veh->external_parts[ep]; if (veh->part_flag(p, vpf_wheel) && one_in(2)) if (displace_water (x + veh->parts[p].precalc_dx[0], y + veh->parts[p].precalc_dy[0]) && pl_ctrl) @@ -927,7 +927,7 @@ bool map::is_outside(const int x, const int y) bool map::flammable_items_at(const int x, const int y) { - for (int i = 0; i < i_at(x, y).size(); i++) { + for (unsigned int i = 0; i < i_at(x, y).size(); i++) { item *it = &(i_at(x, y)[i]); if (it->made_of(PAPER) || it->made_of(WOOD) || it->made_of(COTTON) || it->made_of(POWDER) || it->made_of(VEGGY) || it->is_ammo() || @@ -940,7 +940,7 @@ bool map::flammable_items_at(const int x, const int y) bool map::moppable_items_at(const int x, const int y) { - for (int i = 0; i < i_at(x, y).size(); i++) { + for (unsigned int i = 0; i < i_at(x, y).size(); i++) { item *it = &(i_at(x, y)[i]); if (it->made_of(LIQUID)) return true; @@ -982,7 +982,7 @@ bool map::has_adjacent_furniture(const int /*x*/, const int /*y*/) } void map::mop_spills(const int x, const int y) { - for (int i = 0; i < i_at(x, y).size(); i++) { + for (unsigned int i = 0; i < i_at(x, y).size(); i++) { item *it = &(i_at(x, y)[i]); if (it->made_of(LIQUID)) { i_rem(x, y, i); @@ -1000,14 +1000,14 @@ bool map::bash(const int x, const int y, const int str, std::string &sound, int remove_field(x, y); } - for (int i = 0; i < i_at(x, y).size(); i++) { // Destroy glass items (maybe) + for (unsigned int i = 0; i < i_at(x, y).size(); i++) { // Destroy glass items (maybe) // the check for active supresses molotovs smashing themselves with their own explosion if (i_at(x, y)[i].made_of(GLASS) && !i_at(x, y)[i].active && one_in(2)) { if (sound == "") sound = "A " + i_at(x, y)[i].tname() + " shatters! "; else sound = "Some items shatter! "; - for (int j = 0; j < i_at(x, y)[i].contents.size(); j++) + for (unsigned int j = 0; j < i_at(x, y)[i].contents.size(); j++) i_at(x, y).push_back(i_at(x, y)[i].contents[j]); i_rem(x, y, i); i--; @@ -1800,7 +1800,7 @@ void map::shoot(game *g, const int x, const int y, int &dam, if ((move_cost(x, y) == 2 && !hit_items) || !INBOUNDS(x, y)) return; // Items on floor-type spaces won't be shot up. - for (int i = 0; i < i_at(x, y).size(); i++) { + for (unsigned int i = 0; i < i_at(x, y).size(); i++) { bool destroyed = false; switch (i_at(x, y)[i].type->m1) { case GLASS: @@ -1827,7 +1827,7 @@ void map::shoot(game *g, const int x, const int y, int &dam, break; } if (destroyed) { - for (int j = 0; j < i_at(x, y)[i].contents.size(); j++) + for (unsigned int j = 0; j < i_at(x, y)[i].contents.size(); j++) i_at(x, y).push_back(i_at(x, y)[i].contents[j]); i_rem(x, y, i); i--; @@ -2058,7 +2058,7 @@ point map::find_item(const item *it) point ret; for (ret.x = 0; ret.x < SEEX * my_MAPSIZE; ret.x++) { for (ret.y = 0; ret.y < SEEY * my_MAPSIZE; ret.y++) { - for (int i = 0; i < i_at(ret.x, ret.y).size(); i++) { + for (unsigned int i = 0; i < i_at(ret.x, ret.y).size(); i++) { if (it == &i_at(ret.x, ret.y)[i]) return ret; } @@ -2150,7 +2150,7 @@ void map::process_active_items_in_submap(game *g, const int nonant) for (int i = 0; i < SEEX; i++) { for (int j = 0; j < SEEY; j++) { std::vector *items = &(grid[nonant]->itm[i][j]); - for (int n = 0; n < items->size(); n++) { + for (unsigned int n = 0; n < items->size(); n++) { if ((*items)[n].active) { if (!(*items)[n].is_tool()) { // It's probably a charger gun (*items)[n].active = false; @@ -2184,10 +2184,10 @@ void map::use_amount(const point origin, const int range, const itype_id type, c for (int x = origin.x - radius; x <= origin.x + radius; x++) { for (int y = origin.y - radius; y <= origin.y + radius; y++) { if (rl_dist(origin.x, origin.y, x, y) >= radius) { - for (int n = 0; n < i_at(x, y).size() && quantity > 0; n++) { + for (unsigned int n = 0; n < i_at(x, y).size() && quantity > 0; n++) { item* curit = &(i_at(x, y)[n]); bool used_contents = false; - for (int m = 0; m < curit->contents.size() && quantity > 0; m++) { + for (unsigned int m = 0; m < curit->contents.size() && quantity > 0; m++) { if (curit->contents[m].type->id == type) { quantity--; curit->contents.erase(curit->contents.begin() + m); @@ -2217,10 +2217,10 @@ void map::use_charges(const point origin, const int range, const itype_id type, for (int x = origin.x - radius; x <= origin.x + radius; x++) { for (int y = origin.y - radius; y <= origin.y + radius; y++) { if (rl_dist(origin.x, origin.y, x, y) >= radius) { - for (int n = 0; n < i_at(x, y).size(); n++) { + for (unsigned int n = 0; n < i_at(x, y).size(); n++) { item* curit = &(i_at(x, y)[n]); // Check contents first - for (int m = 0; m < curit->contents.size() && quantity > 0; m++) { + for (unsigned int m = 0; m < curit->contents.size() && quantity > 0; m++) { if (curit->contents[m].type->id == type) { if (curit->contents[m].charges <= quantity) { quantity -= curit->contents[m].charges; @@ -2313,7 +2313,7 @@ void map::disarm_trap(game *g, const int x, const int y) if (roll >= diff) { g->add_msg("You disarm the trap!"); std::vector comp = g->traps[tr_at(x, y)]->components; - for (int i = 0; i < comp.size(); i++) { + for (unsigned int i = 0; i < comp.size(); i++) { if (comp[i] != itm_null) add_item(x, y, g->itypes[comp[i]], 0); } @@ -2829,7 +2829,7 @@ std::vector map::route(const int Fx, const int Fy, const int Tx, const in //debugmsg("Open.size() = %d", open.size()); int best = 9999; int index = -1; - for (int i = 0; i < open.size(); i++) { + for (unsigned int i = 0; i < open.size(); i++) { if (i == 0 || score[open[i].x][open[i].y] < best) { best = score[open[i].x][open[i].y]; index = i; @@ -3117,7 +3117,7 @@ void map::spawn_monsters(game *g) for (int gx = 0; gx < my_MAPSIZE; gx++) { for (int gy = 0; gy < my_MAPSIZE; gy++) { const int n = gx + gy * my_MAPSIZE; - for (int i = 0; i < grid[n]->spawns.size(); i++) { + for (unsigned int i = 0; i < grid[n]->spawns.size(); i++) { for (int j = 0; j < grid[n]->spawns[i].count; j++) { int tries = 0; int mx = grid[n]->spawns[i].posx, my = grid[n]->spawns[i].posy; diff --git a/mapbuffer.cpp b/mapbuffer.cpp index 6aa34281e2a1b..bd7b2f0c44179 100644 --- a/mapbuffer.cpp +++ b/mapbuffer.cpp @@ -121,11 +121,11 @@ void mapbuffer::save() item tmp; for (int j = 0; j < SEEY; j++) { for (int i = 0; i < SEEX; i++) { - for (int k = 0; k < sm->itm[i][j].size(); k++) { + for (unsigned int k = 0; k < sm->itm[i][j].size(); k++) { tmp = sm->itm[i][j][k]; fout << "I " << i << " " << j << std::endl; fout << tmp.save_info() << std::endl; - for (int l = 0; l < tmp.contents.size(); l++) + for (unsigned int l = 0; l < tmp.contents.size(); l++) fout << "C " << std::endl << tmp.contents[l].save_info() << std::endl; } } @@ -151,7 +151,7 @@ void mapbuffer::save() } // Output the spawn points spawn_point tmpsp; - for (int i = 0; i < sm->spawns.size(); i++) { + for (unsigned int i = 0; i < sm->spawns.size(); i++) { tmpsp = sm->spawns[i]; fout << "S " << int(tmpsp.type) << " " << tmpsp.count << " " << tmpsp.posx << " " << tmpsp.posy << " " << tmpsp.faction_id << " " << @@ -159,7 +159,7 @@ void mapbuffer::save() tmpsp.name << std::endl; } // Output the vehicles - for (int i = 0; i < sm->vehicles.size(); i++) { + for (unsigned int i = 0; i < sm->vehicles.size(); i++) { fout << "V "; sm->vehicles[i]->save (fout); } diff --git a/mapgen.cpp b/mapgen.cpp index a8405cb23d6ee..aa8b7bcf7a8d6 100644 --- a/mapgen.cpp +++ b/mapgen.cpp @@ -4192,7 +4192,7 @@ case ot_lmoe: { int origx = rng(SEEX - 1, SEEX), origy = rng(SEEY - 1, SEEY), hermx = rng(SEEX - 6, SEEX + 5), hermy = rng(SEEX - 6, SEEY + 5); std::vector bloodline = line_to(origx, origy, hermx, hermy, 0); - for (int ii = 0; ii < bloodline.size(); ii++) + for (unsigned int ii = 0; ii < bloodline.size(); ii++) add_field(g, bloodline[ii].x, bloodline[ii].y, fd_blood, 2); item body; body.make_corpse(g->itypes[itm_corpse], g->mtypes[mon_null], g->turn); @@ -4215,7 +4215,7 @@ case ot_lmoe: { pathy = rng(SEEY - 6, SEEY + 5); } std::vector pathline = line_to(pathx, pathy, SEEX - 1, SEEY - 1, 0); - for (int ii = 0; ii < pathline.size(); ii++) + for (unsigned int ii = 0; ii < pathline.size(); ii++) square(this, t_dirt, pathline[ii].x, pathline[ii].y, pathline[ii].x + 1, pathline[ii].y + 1); while (!one_in(8)) @@ -4262,7 +4262,7 @@ case ot_lmoe: { do { int tox = (one_in(2) ? 2 : SEEX * 2 - 3), toy = rng(2, SEEY * 2 - 3); std::vector path = line_to(centerx, SEEY - 1, tox, toy, 0); - for (int i = 0; i < path.size(); i++) { + for (unsigned int i = 0; i < path.size(); i++) { for (int cx = path[i].x - 1; cx <= path[i].x + 1; cx++) { for (int cy = path[i].y - 1; cy <= path[i].y + 1; cy++) { ter(cx, cy) = t_rock_floor; @@ -7336,7 +7336,7 @@ void map::place_items(items_location loc, int chance, int x1, int y1, } int item_chance = 0; // # of items - for (int i = 0; i < eligible.size(); i++) + for (unsigned int i = 0; i < eligible.size(); i++) item_chance += (*itypes)[eligible[i]]->rarity; int selection, randnum; int px, py; @@ -7377,7 +7377,7 @@ void map::put_items_from(items_location loc, int num, int x, int y, int turn) { std::vector eligible = (*mapitems)[loc]; int item_chance = 0; // # of items - for (int i = 0; i < eligible.size(); i++) + for (unsigned int i = 0; i < eligible.size(); i++) item_chance += (*itypes)[eligible[i]]->rarity; for (int i = 0; i < num; i++) { @@ -7499,7 +7499,7 @@ void map::rotate(int turns) for (int sy = 0; sy < 2; sy++) { int gridfrom = sx + sy * my_MAPSIZE; int gridto = sx * my_MAPSIZE + 1 - sy; - for (int j = 0; j < grid[gridfrom]->spawns.size(); j++) { + for (unsigned int j = 0; j < grid[gridfrom]->spawns.size(); j++) { spawn_point tmp = grid[gridfrom]->spawns[j]; int tmpy = tmp.posy; tmp.posy = tmp.posx; @@ -7536,7 +7536,7 @@ void map::rotate(int turns) for (int sy = 0; sy < 2; sy++) { int gridfrom = sx + sy * my_MAPSIZE; int gridto = (1 - sy) * my_MAPSIZE + 1 - sx; - for (int j = 0; j < grid[gridfrom]->spawns.size(); j++) { + for (unsigned int j = 0; j < grid[gridfrom]->spawns.size(); j++) { spawn_point tmp = grid[gridfrom]->spawns[j]; tmp.posy = SEEY - 1 - tmp.posy; tmp.posx = SEEX - 1 - tmp.posx; @@ -7573,7 +7573,7 @@ void map::rotate(int turns) for (int sy = 0; sy < 2; sy++) { int gridfrom = sx + sy * my_MAPSIZE; int gridto = (1 - sx) * my_MAPSIZE + sy; - for (int j = 0; j < grid[gridfrom]->spawns.size(); j++) { + for (unsigned int j = 0; j < grid[gridfrom]->spawns.size(); j++) { spawn_point tmp = grid[gridfrom]->spawns[j]; int tmpy = tmp.posy; tmp.posy = SEEX - 1 - tmp.posx; @@ -7601,7 +7601,7 @@ void map::rotate(int turns) // change vehicles' directions for (int i = 0; i < my_MAPSIZE * my_MAPSIZE; i++) - for (int v = 0; v < grid[i]->vehicles.size(); v++) + for (unsigned int v = 0; v < grid[i]->vehicles.size(); v++) if (turns >= 1 && turns <= 3) grid[i]->vehicles[v]->turn (turns * 90); @@ -8366,7 +8366,7 @@ void silo_rooms(map *m) while (rooms.size() > 1) { int best_dist = 999, closest = 0; - for (int i = 1; i < rooms.size(); i++) { + for (unsigned int i = 1; i < rooms.size(); i++) { int dist = trig_dist(rooms[0].x, rooms[0].y, rooms[i].x, rooms[i].y); if (dist < best_dist) { best_dist = dist; @@ -9159,7 +9159,7 @@ void map::add_extra(map_extra type, game *g) int x1 = rng(0, SEEX - 1), y1 = rng(0, SEEY - 1), x2 = rng(SEEX, SEEX * 2 - 1), y2 = rng(SEEY, SEEY * 2 - 1); std::vector fumarole = line_to(x1, y1, x2, y2, 0); - for (int i = 0; i < fumarole.size(); i++) + for (unsigned int i = 0; i < fumarole.size(); i++) ter(fumarole[i].x, fumarole[i].y) = t_lava; } break; @@ -9319,7 +9319,7 @@ void map::create_anomaly(int cx, int cy, artifact_natural_property prop) void line(map *m, ter_id type, int x1, int y1, int x2, int y2) { std::vector line = line_to(x1, y1, x2, y2, 0); - for (int i = 0; i < line.size(); i++) + for (unsigned int i = 0; i < line.size(); i++) m->ter(line[i].x, line[i].y) = type; m->ter(x1, y1) = type; } diff --git a/melee.cpp b/melee.cpp index 1337d70de5be9..814e5034542cd 100644 --- a/melee.cpp +++ b/melee.cpp @@ -1058,7 +1058,7 @@ void player::perform_special_attacks(game *g, monster *z, player *p, int cut_armor = (z == NULL ? 0 : z->armor_cut()); std::vector special_attacks = mutation_attacks(z, p); - for (int i = 0; i < special_attacks.size(); i++) { + for (unsigned int i = 0; i < special_attacks.size(); i++) { bool did_damage = false; if (special_attacks[i].bash > bash_armor) { bash_dam += special_attacks[i].bash; @@ -1207,7 +1207,7 @@ void player::melee_special_effects(game *g, monster *z, player *p, bool crit, g->add_msg("%s %s shatters!", Your.c_str(), weapon.tname(g).c_str()); g->sound(posx, posy, 16, ""); // Dump its contents on the ground - for (int i = 0; i < weapon.contents.size(); i++) + for (unsigned int i = 0; i < weapon.contents.size(); i++) g->m.add_item(posx, posy, weapon.contents[i]); hit(g, bp_arms, 1, 0, rng(0, weapon.volume() * 2));// Take damage if (weapon.is_two_handed(this))// Hurt left arm too, if it was big diff --git a/mission_end.cpp b/mission_end.cpp index 03ae25dcb5e85..2335a3b68ee20 100644 --- a/mission_end.cpp +++ b/mission_end.cpp @@ -4,14 +4,14 @@ void mission_end::heal_infection(game *g, mission *miss) { bool found_npc = false; - for (int i = 0; i < g->active_npc.size() && !found_npc; i++) { + for (unsigned int i = 0; i < g->active_npc.size() && !found_npc; i++) { if (g->active_npc[i].id == miss->npc_id) { g->active_npc[i].rem_disease(DI_INFECTION); found_npc = true; } } - for (int i = 0; !found_npc && i < g->cur_om.npcs.size(); i++) { + for (unsigned int i = 0; !found_npc && i < g->cur_om.npcs.size(); i++) { if (g->cur_om.npcs[i].id == miss->npc_id) { g->cur_om.npcs[i].rem_disease(DI_INFECTION); found_npc = true; diff --git a/mission_fail.cpp b/mission_fail.cpp index 36b4092cf6b4b..ef8934fab7d53 100644 --- a/mission_fail.cpp +++ b/mission_fail.cpp @@ -3,14 +3,14 @@ void mission_fail::kill_npc(game *g, mission *miss) { - for (int i = 0; i < g->active_npc.size(); i++) { + for (unsigned int i = 0; i < g->active_npc.size(); i++) { if (g->active_npc[i].id == miss->npc_id) { g->active_npc[i].die(g, false); g->active_npc.erase(g->active_npc.begin() + i); return; } } - for (int i = 0; i < g->cur_om.npcs.size(); i++) { + for (unsigned int i = 0; i < g->cur_om.npcs.size(); i++) { if (g->cur_om.npcs[i].id == miss->npc_id) { g->cur_om.npcs[i].marked_for_death = true; return; diff --git a/monattack.cpp b/monattack.cpp index 3d722b8001eb3..3ae1096831683 100644 --- a/monattack.cpp +++ b/monattack.cpp @@ -13,7 +13,7 @@ void mattack::antqueen(game *g, monster *z) // Count up all adjacent tiles the contain at least one egg. for (int x = z->posx - 2; x <= z->posx + 2; x++) { for (int y = z->posy - 2; y <= z->posy + 2; y++) { - for (int i = 0; i < g->m.i_at(x, y).size(); i++) { + for (unsigned int i = 0; i < g->m.i_at(x, y).size(); i++) { // is_empty() because we can't hatch an ant under the player, a monster, etc. if (g->m.i_at(x, y)[i].type->id == itm_ant_egg && g->is_empty(x, y)) { egg_points.push_back(point(x, y)); @@ -49,9 +49,9 @@ void mattack::antqueen(game *g, monster *z) int junk; if (g->u_see(z->posx, z->posy, junk)) g->add_msg("The %s tends nearby eggs, and they hatch!", z->name().c_str()); - for (int i = 0; i < egg_points.size(); i++) { + for (unsigned int i = 0; i < egg_points.size(); i++) { int x = egg_points[i].x, y = egg_points[i].y; - for (int j = 0; j < g->m.i_at(x, y).size(); j++) { + for (unsigned int j = 0; j < g->m.i_at(x, y).size(); j++) { if (g->m.i_at(x, y)[j].type->id == itm_ant_egg) { g->m.i_rem(x, y, j); j = g->m.i_at(x, y).size(); // Max one hatch per tile. @@ -85,7 +85,7 @@ void mattack::acid(game *g, monster *z) g->sound(z->posx, z->posy, 4, "a spitting noise."); int hitx = g->u.posx + rng(-2, 2), hity = g->u.posy + rng(-2, 2); std::vector line = line_to(z->posx, z->posy, hitx, hity, junk); - for (int i = 0; i < line.size(); i++) { + for (unsigned int i = 0; i < line.size(); i++) { if (g->m.hit_with_acid(g, line[i].x, line[i].y)) { if (g->u_see(line[i].x, line[i].y, junk)) g->add_msg("A glob of acid hits the %s!", @@ -122,7 +122,7 @@ void mattack::shockstorm(game *g, monster *z) if (!g->m.sees(z->posx, z->posy, tarx, tary, -1, t)) t = 0; std::vector bolt = line_to(z->posx, z->posy, tarx, tary, t); - for (int i = 0; i < bolt.size(); i++) { // Fill the LOS with electricity + for (unsigned int i = 0; i < bolt.size(); i++) { // Fill the LOS with electricity if (!one_in(4)) g->m.add_field(g, bolt[i].x, bolt[i].y, fd_electricity, rng(1, 3)); } @@ -147,7 +147,7 @@ void mattack::boomer(game *g, monster *z) bool u_see = g->u_see(z->posx, z->posy, j); if (u_see) g->add_msg("The %s spews bile!", z->name().c_str()); - for (int i = 0; i < line.size(); i++) { + for (unsigned int i = 0; i < line.size(); i++) { if (g->m.field_at(line[i].x, line[i].y).type == fd_blood) { g->m.field_at(line[i].x, line[i].y).type = fd_bile; g->m.field_at(line[i].x, line[i].y).density = 1; @@ -181,7 +181,7 @@ void mattack::resurrect(game *g, monster *z) for (int x = z->posx - 4; x <= z->posx + 4; x++) { for (int y = z->posy - 4; y <= z->posy + 4; y++) { if (g->is_empty(x, y) && g->m.sees(z->posx, z->posy, x, y, -1, junk)) { - for (int i = 0; i < g->m.i_at(x, y).size(); i++) { + for (unsigned int i = 0; i < g->m.i_at(x, y).size(); i++) { if (g->m.i_at(x, y)[i].type->id == itm_corpse && g->m.i_at(x, y)[i].corpse->species == species_zombie) { corpses.push_back(point(x, y)); @@ -200,9 +200,9 @@ void mattack::resurrect(game *g, monster *z) z->sp_timeout = z->type->sp_freq; // Reset timer z->moves = -500; // It takes a while int raised = 0; - for (int i = 0; i < corpses.size(); i++) { + for (unsigned int i = 0; i < corpses.size(); i++) { int x = corpses[i].x, y = corpses[i].y; - for (int n = 0; n < g->m.i_at(x, y).size(); n++) { + for (unsigned int n = 0; n < g->m.i_at(x, y).size(); n++) { if (g->m.i_at(x, y)[n].type->id == itm_corpse && one_in(2)) { if (g->u_see(x, y, junk)) raised++; @@ -287,7 +287,7 @@ void mattack::science(game *g, monster *z) // I said SCIENCE again! case 4: // Acid pool g->add_msg("The %s drops a flask of acid!", z->name().c_str()); z->moves -= 100; - for (int i = 0; i < free.size(); i++) + for (unsigned int i = 0; i < free.size(); i++) g->m.add_field(g, free[i].x, free[i].y, fd_acid, 3); break; case 5: // Flavor text @@ -466,7 +466,7 @@ void mattack::vine(game *g, monster *z) } // Calculate distance from nearest hub int dist_from_hub = 999; - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { if (g->z[i].type->id == mon_creeper_hub) { int dist = rl_dist(z->posx, z->posy, g->z[i].posx, g->z[i].posy); if (dist < dist_from_hub) @@ -506,7 +506,7 @@ void mattack::spit_sap(game *g, monster *z) hity = g->u.posy + rng(0 - int(missed_by), int(missed_by)); std::vector line = line_to(z->posx, z->posy, hitx, hity, 0); int dam = 5; - for (int i = 0; i < line.size() && dam > 0; i++) { + for (unsigned int i = 0; i < line.size() && dam > 0; i++) { g->m.shoot(g, line[i].x, line[i].y, dam, false, 0); if (dam == 0 && g->u_see(line[i].x, line[i].y, t)) { g->add_msg("A glob of sap hits the %s!", @@ -522,7 +522,7 @@ void mattack::spit_sap(game *g, monster *z) g->add_msg("The %s spits sap!", z->name().c_str()); std::vector line = line_to(z->posx, z->posy, g->u.posx, g->u.posy, t); int dam = 5; - for (int i = 0; i < line.size() && dam > 0; i++) { + for (unsigned int i = 0; i < line.size() && dam > 0; i++) { g->m.shoot(g, line[i].x, line[i].y, dam, false, 0); if (dam == 0 && g->u_see(line[i].x, line[i].y, t)) { g->add_msg("A glob of sap hits the %s!", @@ -676,7 +676,7 @@ void mattack::leap(game *g, monster *z) } // Go back and remove all options that aren't tied for best - for (int i = 0; i < options.size() && options.size() > 1; i++) { + for (unsigned int i = 0; i < options.size() && options.size() > 1; i++) { point p = options[i]; if (rl_dist(g->u.posx, g->u.posy, options[i].x, options[i].y) != best) { options.erase(options.begin() + i); @@ -852,7 +852,7 @@ void mattack::tentacle(game *g, monster *z) z->sp_timeout = z->type->sp_freq; // Reset timer std::vector line = line_to(z->posx, z->posy, g->u.posx, g->u.posy, t); - for (int i = 0; i < line.size(); i++) { + for (unsigned int i = 0; i < line.size(); i++) { int tmpdam = 20; g->m.shoot(g, line[i].x, line[i].y, tmpdam, true, 0); } @@ -901,7 +901,7 @@ void mattack::vortex(game *g, monster *z) if (distance > 0) { int dam = thrown.weight() / double(3 + double(thrown.volume() / 6)); std::vector traj = continue_line(from_monster, distance); - for (int i = 0; i < traj.size() && dam > 0; i++) { + for (unsigned int i = 0; i < traj.size() && dam > 0; i++) { g->m.shoot(g, traj[i].x, traj[i].y, dam, false, 0); int mondex = g->mon_at(traj[i].x, traj[i].y); if (mondex != -1) { @@ -925,7 +925,7 @@ void mattack::vortex(game *g, monster *z) if (thrown.made_of(GLASS)) { if (g->u_see(traj[i].x, traj[i].y, t)) g->add_msg("The %s shatters!", thrown.tname().c_str()); - for (int n = 0; n < thrown.contents.size(); n++) + for (unsigned int n = 0; n < thrown.contents.size(); n++) g->m.add_item(traj[i].x, traj[i].y, thrown.contents[n]); g->sound(traj[i].x, traj[i].y, 16, "glass breaking!"); } else @@ -970,7 +970,7 @@ void mattack::vortex(game *g, monster *z) g->add_msg("The %s is thrown by winds!", thrown->name().c_str()); std::vector traj = continue_line(from_monster, distance); bool hit_wall = false; - for (int i = 0; i < traj.size() && !hit_wall; i++) { + for (unsigned int i = 0; i < traj.size() && !hit_wall; i++) { int monhit = g->mon_at(traj[i].x, traj[i].y); if (i > 0 && monhit != -1 && !g->z[monhit].has_flag(MF_DIGS)) { if (g->u_see(traj[i].x, traj[i].y, t)) @@ -1007,7 +1007,7 @@ void mattack::vortex(game *g, monster *z) g->add_msg("You're thrown by winds!"); bool hit_wall = false; int damage = rng(5, 10); - for (int i = 0; i < traj.size() && !hit_wall; i++) { + for (unsigned int i = 0; i < traj.size() && !hit_wall; i++) { int monhit = g->mon_at(traj[i].x, traj[i].y); if (i > 0 && monhit != -1 && !g->z[monhit].has_flag(MF_DIGS)) { if (g->u_see(traj[i].x, traj[i].y, t)) @@ -1066,7 +1066,7 @@ void mattack::stare(game *g, monster *z) } else { g->add_msg("A piercing beam of light bursts forth!"); std::vector sight = line_to(z->posx, z->posy, g->u.posx, g->u.posy, 0); - for (int i = 0; i < sight.size(); i++) { + for (unsigned int i = 0; i < sight.size(); i++) { if (g->m.ter(sight[i].x, sight[i].y) == t_reinforced_glass_h || g->m.ter(sight[i].x, sight[i].y) == t_reinforced_glass_v) i = sight.size(); @@ -1128,7 +1128,7 @@ void mattack::smg(game *g, monster *z) if (z->friendly != 0) { // Attacking monsters, not the player! monster* target = NULL; int closest = 19; - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { int dist = rl_dist(z->posx, z->posy, g->z[i].posx, g->z[i].posy); if (g->z[i].friendly == 0 && dist < closest && g->m.sees(z->posx, z->posy, g->z[i].posx, g->z[i].posy, 18, t)) { @@ -1211,7 +1211,7 @@ void mattack::flamethrower(game *g, monster *z) z->sp_timeout = z->type->sp_freq; // Reset timer z->moves = -500; // It takes a while std::vector traj = line_to(z->posx, z->posy, g->u.posx, g->u.posy, t); - for (int i = 0; i < traj.size(); i++) + for (unsigned int i = 0; i < traj.size(); i++) g->m.add_field(g, traj[i].x, traj[i].y, fd_fire, 1); g->u.add_disease(DI_ONFIRE, 8, g); } @@ -1289,7 +1289,7 @@ void mattack::generator(game *g, monster *z) void mattack::upgrade(game *g, monster *z) { std::vector targets; - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { if (g->z[i].type->id == mon_zombie && rl_dist(z->posx, z->posy, g->z[i].posx, g->z[i].posy) <= 5) targets.push_back(i); diff --git a/mondeath.cpp b/mondeath.cpp index 3e6f34892937d..cdfb35bbeb8d0 100644 --- a/mondeath.cpp +++ b/mondeath.cpp @@ -62,7 +62,7 @@ void mdeath::kill_vines(game *g, monster *z) { std::vector vines; std::vector hubs; - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { if (g->z[i].type->id == mon_creeper_hub && (g->z[i].posx != z->posx || g->z[i].posy != z->posy)) hubs.push_back(i); @@ -70,11 +70,11 @@ void mdeath::kill_vines(game *g, monster *z) vines.push_back(i); } - for (int i = 0; i < vines.size(); i++) { + for (unsigned int i = 0; i < vines.size(); i++) { monster *vine = &(g->z[ vines[i] ]); int dist = rl_dist(vine->posx, vine->posy, z->posx, z->posy); bool closer_hub = false; - for (int j = 0; j < hubs.size() && !closer_hub; j++) { + for (unsigned int j = 0; j < hubs.size() && !closer_hub; j++) { if (rl_dist(vine->posx, vine->posy, g->z[ hubs[j] ].posx, g->z[ hubs[j] ].posy) < dist) closer_hub = true; @@ -97,7 +97,7 @@ void mdeath::vine_cut(game *g, monster *z) } } - for (int i = 0; i < vines.size(); i++) { + for (unsigned int i = 0; i < vines.size(); i++) { bool found_neighbor = false; monster *vine = &(g->z[ vines[i] ]); for (int x = vine->posx - 1; x <= vine->posx + 1 && !found_neighbor; x++) { @@ -263,7 +263,7 @@ void mdeath::amigara(game *g, monster *z) { if (g->u.has_disease(DI_AMIGARA)) { int count = 0; - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { if (g->z[i].type->id == mon_amigara_horror) count++; } @@ -310,7 +310,7 @@ void mdeath::gameover(game *g, monster *z) void mdeath::kill_breathers(game *g, monster * /*z*/) { - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { if (g->z[i].type->id == mon_breather_hub || g->z[i].type->id == mon_breather) g->z[i].dead = true; } diff --git a/monmove.cpp b/monmove.cpp index b6974d8332e9a..ed4b5a80c240f 100644 --- a/monmove.cpp +++ b/monmove.cpp @@ -73,7 +73,7 @@ void monster::plan(game *g) int tc = 0, stc = 0; bool fleeing = false; if (friendly != 0) { // Target monsters, not the player! - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { monster *tmp = &(g->z[i]); if (tmp->friendly == 0 && rl_dist(posx, posy, tmp->posx, tmp->posy) < dist && g->m.sees(posx, posy, tmp->posx, tmp->posy, sightrange, tc)) { @@ -109,7 +109,7 @@ void monster::plan(game *g) closest = -2; stc = tc; } - for (int i = 0; i < g->active_npc.size(); i++) { + for (unsigned int i = 0; i < g->active_npc.size(); i++) { npc *me = &(g->active_npc[i]); int medist = rl_dist(posx, posy, me->posx, me->posy); if ((medist < dist || (!fleeing && is_fleeing(*me))) && @@ -131,7 +131,7 @@ void monster::plan(game *g) } if (!fleeing) { fleeing = attitude() == MATT_FLEE; - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { monster *mon = &(g->z[i]); int mondist = rl_dist(posx, posy, mon->posx, mon->posy); if (mon->friendly != 0 && mondist < dist && can_see() && @@ -213,7 +213,7 @@ void monster::move(game *g) if (plans.back().x == g->u.posx && plans.back().y == g->u.posy) current_attitude = attitude(&(g->u)); else { - for (int i = 0; i < g->active_npc.size(); i++) { + for (unsigned int i = 0; i < g->active_npc.size(); i++) { if (plans.back().x == g->active_npc[i].posx && plans.back().y == g->active_npc[i].posy) current_attitude = attitude(&(g->active_npc[i])); @@ -557,20 +557,20 @@ void monster::hit_player(game *g, player &p, bool can_grab) } // Adjust anger/morale of same-species monsters, if appropriate int anger_adjust = 0, morale_adjust = 0; - for (int i = 0; i < type->anger.size(); i++) { + for (unsigned int i = 0; i < type->anger.size(); i++) { if (type->anger[i] == MTRIG_FRIEND_ATTACKED) anger_adjust += 15; } - for (int i = 0; i < type->placate.size(); i++) { + for (unsigned int i = 0; i < type->placate.size(); i++) { if (type->placate[i] == MTRIG_FRIEND_ATTACKED) anger_adjust -= 15; } - for (int i = 0; i < type->fear.size(); i++) { + for (unsigned int i = 0; i < type->fear.size(); i++) { if (type->fear[i] == MTRIG_FRIEND_ATTACKED) morale_adjust -= 15; } if (anger_adjust != 0 && morale_adjust != 0) { - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { g->z[i].morale += morale_adjust; g->z[i].anger += anger_adjust; } @@ -788,7 +788,7 @@ int monster::turns_to_reach(game *g, int x, int y) return 999; double turns = 0.; - for (int i = 0; i < path.size(); i++) { + for (unsigned int i = 0; i < path.size(); i++) { if (g->m.move_cost(path[i].x, path[i].y) == 0) // We have to bash through turns += 5; else diff --git a/monster.cpp b/monster.cpp index e615638e4bd84..e518badb9bea0 100644 --- a/monster.cpp +++ b/monster.cpp @@ -240,7 +240,7 @@ nc_color monster::color_with_effects() bool monster::has_flag(m_flag f) { - for (int i = 0; i < type->flags.size(); i++) { + for (unsigned int i = 0; i < type->flags.size(); i++) { if (type->flags[i] == f) return true; } @@ -288,7 +288,7 @@ std::string monster::save_info() " " << sp_timeout << " " << plans.size() << " " << friendly << " " << faction_id << " " << mission_id << " " << dead << " " << anger << " " << morale; - for (int i = 0; i < plans.size(); i++) { + for (unsigned int i = 0; i < plans.size(); i++) { pack << " " << plans[i].x << " " << plans[i].y; } return pack.str(); @@ -299,7 +299,7 @@ void monster::debug(player &u) char buff[2]; debugmsg("%s has %d steps planned.", name().c_str(), plans.size()); debugmsg("%s Moves %d Speed %d HP %d",name().c_str(), moves, speed, hp); - for (int i = 0; i < plans.size(); i++) { + for (unsigned int i = 0; i < plans.size(); i++) { sprintf(buff, "%d", i); if (i < 10) mvaddch(plans[i].y - SEEY + u.posy, plans[i].x - SEEX + u.posx, buff[0]); @@ -312,7 +312,7 @@ void monster::shift(int sx, int sy) { posx -= sx * SEEX; posy -= sy * SEEY; - for (int i = 0; i < plans.size(); i++) { + for (unsigned int i = 0; i < plans.size(); i++) { plans[i].x -= sx * SEEX; plans[i].y -= sy * SEEY; } @@ -385,15 +385,15 @@ void monster::process_triggers(game *g) // This Adjustes anger/morale levels given a single trigger. void monster::process_trigger(monster_trigger trig, int amount) { - for (int i = 0; i < type->anger.size(); i++) { + for (unsigned int i = 0; i < type->anger.size(); i++) { if (type->anger[i] == trig) anger += amount; } - for (int i = 0; i < type->placate.size(); i++) { + for (unsigned int i = 0; i < type->placate.size(); i++) { if (type->placate[i] == trig) anger -= amount; } - for (int i = 0; i < type->fear.size(); i++) { + for (unsigned int i = 0; i < type->fear.size(); i++) { if (type->fear[i] == trig) morale -= amount; } @@ -404,7 +404,7 @@ int monster::trigger_sum(game *g, std::vector *triggers) { int ret = 0; bool check_terrain = false, check_meat = false, check_fire = false; - for (int i = 0; i < triggers->size(); i++) { + for (unsigned int i = 0; i < triggers->size(); i++) { switch ((*triggers)[i]) { case MTRIG_TIME: @@ -420,7 +420,7 @@ int monster::trigger_sum(game *g, std::vector *triggers) case MTRIG_PLAYER_CLOSE: if (rl_dist(posx, posy, g->u.posx, g->u.posy) <= 5) ret += 5; - for (int i = 0; i < g->active_npc.size(); i++) { + for (unsigned int i = 0; i < g->active_npc.size(); i++) { if (rl_dist(posx, posy, g->active_npc[i].posx, g->active_npc[i].posy) <= 5) ret += 5; } @@ -446,7 +446,7 @@ int monster::trigger_sum(game *g, std::vector *triggers) for (int y = posy - 3; y <= posy + 3; y++) { if (check_meat) { std::vector *items = &(g->m.i_at(x, y)); - for (int n = 0; n < items->size(); n++) { + for (unsigned int n = 0; n < items->size(); n++) { if ((*items)[n].type->id == itm_corpse || (*items)[n].type->id == itm_meat || (*items)[n].type->id == itm_meat_tainted) { @@ -630,7 +630,7 @@ void monster::die(game *g) debugmsg("Type %s has item_chance %d but no items assigned!", type->name.c_str(), type->item_chance); else { - for (int i = 0; i < it.size(); i++) + for (unsigned int i = 0; i < it.size(); i++) total_chance += it[i].chance; while (rng(0, 99) < abs(type->item_chance) && !animal_done) { @@ -642,7 +642,7 @@ void monster::die(game *g) } total_it_chance = 0; mapit = g->mapitems[it[selected_location].loc]; - for (int i = 0; i < mapit.size(); i++) + for (unsigned int i = 0; i < mapit.size(); i++) total_it_chance += g->itypes[mapit[i]]->rarity; cur_chance = rng(1, total_it_chance); selected_item = -1; @@ -659,10 +659,10 @@ void monster::die(game *g) // If we're a queen, make nearby groups of our type start to die out if (has_flag(MF_QUEEN)) { std::vector groups = g->cur_om.monsters_at(g->levx, g->levy); - for (int i = 0; i < groups.size(); i++) { + for (unsigned int i = 0; i < groups.size(); i++) { moncat_id moncat_type = groups[i]->type; bool match = false; - for (int j = 0; !match && j < g->moncats[moncat_type].size(); j++) { + for (unsigned int j = 0; !match && j < g->moncats[moncat_type].size(); j++) { if (g->moncats[moncat_type][j] == type->id) match = true; } @@ -677,10 +677,10 @@ void monster::die(game *g) tmp = overmap(g, g->cur_om.posx, g->cur_om.posy, 0); groups = tmp.monsters_at(g->levx, g->levy); - for (int i = 0; i < groups.size(); i++) { + for (unsigned int i = 0; i < groups.size(); i++) { moncat_id moncat_type = groups[i]->type; bool match = false; - for (int j = 0; !match && j < g->moncats[moncat_type].size(); j++) { + for (unsigned int j = 0; !match && j < g->moncats[moncat_type].size(); j++) { if (g->moncats[moncat_type][j] == type->id) match = true; } @@ -701,21 +701,21 @@ void monster::die(game *g) (md.*type->dies)(g, this); // If our species fears seeing one of our own die, process that int anger_adjust = 0, morale_adjust = 0; - for (int i = 0; i < type->anger.size(); i++) { + for (unsigned int i = 0; i < type->anger.size(); i++) { if (type->anger[i] == MTRIG_FRIEND_DIED) anger_adjust += 15; } - for (int i = 0; i < type->placate.size(); i++) { + for (unsigned int i = 0; i < type->placate.size(); i++) { if (type->placate[i] == MTRIG_FRIEND_DIED) anger_adjust -= 15; } - for (int i = 0; i < type->fear.size(); i++) { + for (unsigned int i = 0; i < type->fear.size(); i++) { if (type->fear[i] == MTRIG_FRIEND_DIED) morale_adjust -= 15; } if (anger_adjust != 0 && morale_adjust != 0) { int light = g->light_level(); - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { int t = 0; if (g->m.sees(g->z[i].posx, g->z[i].posy, posx, posy, light, t)) { g->z[i].morale += morale_adjust; @@ -727,7 +727,7 @@ void monster::die(game *g) void monster::add_effect(monster_effect_type effect, int duration) { - for (int i = 0; i < effects.size(); i++) { + for (unsigned int i = 0; i < effects.size(); i++) { if (effects[i].type == effect) { effects[i].duration += duration; return; @@ -738,7 +738,7 @@ void monster::add_effect(monster_effect_type effect, int duration) bool monster::has_effect(monster_effect_type effect) { - for (int i = 0; i < effects.size(); i++) { + for (unsigned int i = 0; i < effects.size(); i++) { if (effects[i].type == effect) return true; } @@ -747,7 +747,7 @@ bool monster::has_effect(monster_effect_type effect) void monster::rem_effect(monster_effect_type effect) { - for (int i = 0; i < effects.size(); i++) { + for (unsigned int i = 0; i < effects.size(); i++) { if (effects[i].type == effect) { effects.erase(effects.begin() + i); i--; @@ -757,7 +757,7 @@ void monster::rem_effect(monster_effect_type effect) void monster::process_effects(game *g) { - for (int i = 0; i < effects.size(); i++) { + for (unsigned int i = 0; i < effects.size(); i++) { switch (effects[i].type) { case ME_POISONED: speed -= rng(0, 3); diff --git a/mutation.cpp b/mutation.cpp index 32c12adc2f2c8..af9cca83be450 100644 --- a/mutation.cpp +++ b/mutation.cpp @@ -17,13 +17,13 @@ void player::mutate(game *g) std::vector upgrades; for (int i = 1; i < PF_MAX2; i++) { if (has_trait(i)) { - for (int j = 0; j < g->mutation_data[i].replacements.size(); j++) { + for (unsigned int j = 0; j < g->mutation_data[i].replacements.size(); j++) { pl_flag tmp = g->mutation_data[i].replacements[j]; if (!has_trait(tmp) && !has_child_flag(g, tmp) && (!force_bad || traits[tmp].points <= 0)) upgrades.push_back(tmp); } - for (int j = 0; j < g->mutation_data[i].additions.size(); j++) { + for (unsigned int j = 0; j < g->mutation_data[i].additions.size(); j++) { pl_flag tmp = g->mutation_data[i].additions[j]; if (!has_trait(tmp) && !has_child_flag(g, tmp) && (!force_bad || traits[tmp].points <= 0)) @@ -71,7 +71,7 @@ void player::mutate(game *g) // Remove anything we already have, or that we have a child of, or that's // positive and we're forcing bad - for (int i = 0; i < valid.size(); i++) { + for (unsigned int i = 0; i < valid.size(); i++) { if (has_trait(valid[i]) || has_child_flag(g, valid[i]) || (force_bad && traits[ valid[i] ].points > 0)) { valid.erase(valid.begin() + i); @@ -103,7 +103,7 @@ void player::mutate_towards(game *g, pl_flag mut) std::vector prereq = g->mutation_data[mut].prereqs; std::vector cancel = g->mutation_data[mut].cancels; - for (int i = 0; i < cancel.size(); i++) { + for (unsigned int i = 0; i < cancel.size(); i++) { if (!has_trait( cancel[i] )) { cancel.erase(cancel.begin() + i); i--; @@ -116,7 +116,7 @@ void player::mutate_towards(game *g, pl_flag mut) return; } - for (int i = 0; !has_prereqs && i < prereq.size(); i++) { + for (unsigned int i = 0; !has_prereqs && i < prereq.size(); i++) { if (has_trait(prereq[i])) has_prereqs = true; } @@ -129,10 +129,10 @@ void player::mutate_towards(game *g, pl_flag mut) // Check if one of the prereqs that we have TURNS INTO this one pl_flag replacing = PF_NULL; prereq = g->mutation_data[mut].prereqs; // Reset it - for (int i = 0; i < prereq.size(); i++) { + for (unsigned int i = 0; i < prereq.size(); i++) { if (has_trait(prereq[i])) { pl_flag pre = prereq[i]; - for (int j = 0; replacing == PF_NULL && + for (unsigned int j = 0; replacing == PF_NULL && j < g->mutation_data[pre].replacements.size(); j++) { if (g->mutation_data[pre].replacements[j] == mut) replacing = pre; @@ -153,7 +153,7 @@ void player::mutate_towards(game *g, pl_flag mut) for (int i = 0; i < NUM_MUTATION_CATEGORIES; i++) { std::vector group = mutations_from_category(mutation_category(i)); bool found = false; - for (int j = 0; !found && j < group.size(); j++) { + for (unsigned int j = 0; !found && j < group.size(); j++) { if (group[j] == mut) found = true; } @@ -171,9 +171,9 @@ void player::remove_mutation(game *g, pl_flag mut) // Check if there's a prereq we should shrink back into pl_flag replacing = PF_NULL; std::vector originals = g->mutation_data[mut].prereqs; - for (int i = 0; replacing == PF_NULL && i < originals.size(); i++) { + for (unsigned int i = 0; replacing == PF_NULL && i < originals.size(); i++) { pl_flag pre = originals[i]; - for (int j = 0; replacing == PF_NULL && + for (unsigned int j = 0; replacing == PF_NULL && j < g->mutation_data[pre].replacements.size(); j++) { if (g->mutation_data[pre].replacements[j] == mut) replacing = pre; @@ -196,7 +196,7 @@ void player::remove_mutation(game *g, pl_flag mut) bool player::has_child_flag(game *g, pl_flag flag) { - for (int i = 0; i < g->mutation_data[flag].replacements.size(); i++) { + for (unsigned int i = 0; i < g->mutation_data[flag].replacements.size(); i++) { pl_flag tmp = g->mutation_data[flag].replacements[i]; if (has_trait(tmp) || has_child_flag(g, tmp)) return true; @@ -206,7 +206,7 @@ bool player::has_child_flag(game *g, pl_flag flag) void player::remove_child_flag(game *g, pl_flag flag) { - for (int i = 0; i < g->mutation_data[flag].replacements.size(); i++) { + for (unsigned int i = 0; i < g->mutation_data[flag].replacements.size(); i++) { pl_flag tmp = g->mutation_data[flag].replacements[i]; if (has_trait(tmp)) { remove_mutation(g, tmp); @@ -323,8 +323,8 @@ void mutation_effect(game *g, player &p, pl_flag mut) break; } - for (int i = 0; i < p.worn.size(); i++) { - for (int j = 0; j < bps.size(); j++) { + for (unsigned int i = 0; i < p.worn.size(); i++) { + for (unsigned int j = 0; j < bps.size(); j++) { if ((dynamic_cast(p.worn[i].type))->covers & mfb(bps[j])) { if (destroy) { if (is_u) diff --git a/npc.cpp b/npc.cpp index 18690aa3e96be..99b0bc66e0c9f 100644 --- a/npc.cpp +++ b/npc.cpp @@ -108,15 +108,15 @@ npc& npc::operator= (const npc & rhs) ret_null = rhs.ret_null; inv = rhs.inv; worn.clear(); - for (int i = 0; i < rhs.worn.size(); i++) + for (unsigned int i = 0; i < rhs.worn.size(); i++) worn.push_back(rhs.worn[i]); needs.clear(); - for (int i = 0; i < rhs.needs.size(); i++) + for (unsigned int i = 0; i < rhs.needs.size(); i++) needs.push_back(rhs.needs[i]); path.clear(); - for (int i = 0; i < rhs.path.size(); i++) + for (unsigned int i = 0; i < rhs.path.size(); i++) path.push_back(rhs.path[i]); for (int i = 0; i < num_hp_parts; i++) { @@ -128,7 +128,7 @@ npc& npc::operator= (const npc & rhs) sklevel[i] = rhs.sklevel[i]; styles.clear(); - for (int i = 0; i < rhs.styles.size(); i++) + for (unsigned int i = 0; i < rhs.styles.size(); i++) styles.push_back(rhs.styles[i]); return *this; @@ -155,20 +155,20 @@ std::string npc::save_info() dump << int(sklevel[i]) << " " << skexercise[i] << " "; dump << styles.size() << " "; - for (int i = 0; i < styles.size(); i++) + for (unsigned int i = 0; i < styles.size(); i++) dump << int(styles[i]) << " "; dump << illness.size() << " "; - for (int i = 0; i < illness.size(); i++) + for (unsigned int i = 0; i < illness.size(); i++) dump << int(illness[i].type) << " " << illness[i].duration << " "; dump << addictions.size() << " "; - for (int i = 0; i < addictions.size(); i++) + for (unsigned int i = 0; i < addictions.size(); i++) dump << int(addictions[i].type) << " " << addictions[i].intensity << " " << addictions[i].sated << " "; dump << my_bionics.size() << " "; - for (int i = 0; i < my_bionics.size(); i++) + for (unsigned int i = 0; i < my_bionics.size(); i++) dump << int(my_bionics[i].id) << " " << my_bionics[i].invlet << " " << int(my_bionics[i].powered) << " " << my_bionics[i].charge << " "; @@ -191,16 +191,16 @@ std::string npc::save_info() // Inventory size, plus armor size, plus 1 for the weapon dump << std::endl << inv.num_items() + worn.size() + 1 << std::endl; for (int i = 0; i < inv.size(); i++) { - for (int j = 0; j < inv.stack_at(i).size(); j++) { + for (unsigned int j = 0; j < inv.stack_at(i).size(); j++) { dump << "I " << inv.stack_at(i)[j].save_info() << std::endl; - for (int k = 0; k < inv.stack_at(i)[j].contents.size(); k++) + for (unsigned int k = 0; k < inv.stack_at(i)[j].contents.size(); k++) dump << "C " << inv.stack_at(i)[j].contents[k].save_info() << std::endl; } } dump << "w " << weapon.save_info() << std::endl; - for (int i = 0; i < worn.size(); i++) + for (unsigned int i = 0; i < worn.size(); i++) dump << "W " << worn[i].save_info() << std::endl; - for (int j = 0; j < weapon.contents.size(); j++) + for (unsigned int j = 0; j < weapon.contents.size(); j++) dump << "c " << weapon.contents[j].save_info() << std::endl; return dump.str(); @@ -957,8 +957,8 @@ std::vector starting_inv(npc *me, npc_class type, game *g) } } - for (int i = 0; i < ret.size(); i++) { - for (int j = 0; j < g->mapitems[mi_trader_avoid].size(); j++) { + for (unsigned int i = 0; i < ret.size(); i++) { + for (unsigned int j = 0; j < g->mapitems[mi_trader_avoid].size(); j++) { if (ret[i].type->id == g->mapitems[mi_trader_avoid][j]) { ret.erase(ret.begin() + i); i--; @@ -1083,7 +1083,7 @@ bool npc::wear_if_wanted(item it) } // Otherwise, maybe we should take off one or more items and replace them std::vector removal; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { for (int j = 0; j < num_bp; j++) { if (armor->covers & mfb(j) && dynamic_cast(worn[i].type)->covers & mfb(j)) { @@ -1092,7 +1092,7 @@ bool npc::wear_if_wanted(item it) } } } - for (int i = 0; i < removal.size(); i++) { + for (unsigned int i = 0; i < removal.size(); i++) { if (true) { // if (worn[removal[i]].value_to(this) < it.value_to(this)) { inv.push_back(worn[removal[i]]); @@ -1240,7 +1240,7 @@ void npc::form_opinion(player *u) op_of_u.value++; } decide_needs(); - for (int i = 0; i < needs.size(); i++) { + for (unsigned int i = 0; i < needs.size(); i++) { if (needs[i] == need_food || needs[i] == need_drink) op_of_u.value += 2; } @@ -1345,7 +1345,7 @@ bool npc::wants_to_travel_with(player * /*p*/) int npc::assigned_missions_value(game *g) { int ret = 0; - for (int i = 0; i < chatbin.missions_assigned.size(); i++) + for (unsigned int i = 0; i < chatbin.missions_assigned.size(); i++) ret += g->find_mission(chatbin.missions_assigned[i])->value; return ret; } @@ -1367,9 +1367,9 @@ std::vector npc::styles_offered_to(player *p) std::vector ret; if (p == NULL) return ret; - for (int i = 0; i < styles.size(); i++) { + for (unsigned int i = 0; i < styles.size(); i++) { bool found = false; - for (int j = 0; j < p->styles.size() && !found; j++) { + for (unsigned int j = 0; j < p->styles.size() && !found; j++) { if (p->styles[j] == styles[i]) found = true; } @@ -1439,7 +1439,7 @@ void npc::decide_needs() } } needs.clear(); - int j; + unsigned int j; bool serious = false; for (int i = 1; i < num_needs; i++) { if (needrank[i] < 10) @@ -1672,7 +1672,7 @@ int npc::danger_assessment(game *g) { int ret = 0; int sightdist = g->light_level(), junk; - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { if (g->m.sees(posx, posy, g->z[i].posx, g->z[i].posy, sightdist, junk)) ret += g->z[i].type->difficulty; } @@ -1836,7 +1836,7 @@ void npc::print_info(WINDOW* w) std::string wearing; std::stringstream wstr; wstr << "Wearing: "; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (i > 0) wstr << ", "; wstr << worn[i].tname(); @@ -1860,7 +1860,7 @@ std::string npc::short_description() { std::stringstream ret; ret << "Wielding " << weapon.tname() << "; " << "Wearing: "; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (i > 0) ret << ", "; ret << worn[i].tname(); @@ -1977,12 +1977,12 @@ void npc::die(game *g, bool your_fault) g->m.add_item(posx, posy, my_body); for (int i = 0; i < inv.size(); i++) g->m.add_item(posx, posy, inv[i]); - for (int i = 0; i < worn.size(); i++) + for (unsigned int i = 0; i < worn.size(); i++) g->m.add_item(posx, posy, worn[i]); if (weapon.type->id != itm_null) g->m.add_item(posx, posy, weapon); - for (int i = 0; i < g->active_missions.size(); i++) { + for (unsigned int i = 0; i < g->active_missions.size(); i++) { if (g->active_missions[i].npc_id == id) g->fail_mission( g->active_missions[i].uid ); } diff --git a/npcmove.cpp b/npcmove.cpp index ffd2d7551bedc..84d02b3c8c8b7 100644 --- a/npcmove.cpp +++ b/npcmove.cpp @@ -331,7 +331,7 @@ void npc::choose_monster_target(game *g, int &enemy, int &danger, int highest_priority = 0; total_danger = 0; - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { monster *mon = &(g->z[i]); if (g->pl_sees(this, mon, linet)) { int distance = (100 * rl_dist(posx, posy, mon->posx, mon->posy)) / @@ -480,7 +480,7 @@ npc_action npc::method_of_attack(game *g, int target, int danger) } bool has_ammo_for_empty_gun = false; - for (int i = 0; i < empty_guns.size(); i++) { + for (unsigned int i = 0; i < empty_guns.size(); i++) { for (int j = 0; j < inv.size(); j++) { if (inv[j].is_ammo() && inv[j].ammo_type() == inv[ empty_guns[i] ].ammo_type()) @@ -771,7 +771,7 @@ bool npc::wont_hit_friend(game *g, int tarx, int tary, int index) else traj = line_to(posx, posy, tarx, tary, 0); - for (int i = 0; i < traj.size(); i++) { + for (unsigned int i = 0; i < traj.size(); i++) { int dist = rl_dist(posx, posy, traj[i].x, traj[i].y); int deviation = 1 + int(dist / confident); for (int x = traj[i].x - deviation; x <= traj[i].x + deviation; x++) { @@ -1029,7 +1029,7 @@ void npc::avoid_friendly_fire(game *g, int target) break; } - for (int i = 0; i < valid_moves.size(); i++) { + for (unsigned int i = 0; i < valid_moves.size(); i++) { if (can_move_to(g, valid_moves[i].x, valid_moves[i].y)) { move_to(g, valid_moves[i].x, valid_moves[i].y); return; @@ -1071,7 +1071,7 @@ void npc::move_away_from(game *g, int x, int y) options.push_back( point(posx - dx, posy + dy) ); } - for (int i = 0; i < options.size(); i++) { + for (unsigned int i = 0; i < options.size(); i++) { if (can_move_to(g, options[i].x, options[i].y)) move_to(g, options[i].x, options[i].y); } @@ -1113,7 +1113,7 @@ void npc::find_item(game *g) for (int x = minx; x <= maxx; x++) { for (int y = miny; y <= maxy; y++) { if (g->m.sees(posx, posy, x, y, range, linet)) { - for (int i = 0; i < g->m.i_at(x, y).size(); i++) { + for (unsigned int i = 0; i < g->m.i_at(x, y).size(); i++) { int itval = value(g->m.i_at(x, y)[i]); int wgt = g->m.i_at(x, y)[i].weight(), vol = g->m.i_at(x, y)[i].volume(); if (itval > best_value && @@ -1157,7 +1157,7 @@ void npc::pick_up_item(game *g) int total_volume = 0, total_weight = 0; // How much the items will add std::vector pickup; // Indices of items we want - for (int i = 0; i < items->size(); i++) { + for (unsigned int i = 0; i < items->size(); i++) { int itval = value((*items)[i]), vol = (*items)[i].volume(), wgt = (*items)[i].weight(); if (itval >= minimum_item_value() &&// (itval >= worst_item_value || @@ -1206,13 +1206,13 @@ void npc::pick_up_item(game *g) g->add_msg("Someone picks up several items."); } - for (int i = 0; i < pickup.size(); i++) { + for (unsigned int i = 0; i < pickup.size(); i++) { int itval = value((*items)[pickup[i]]); if (itval < worst_item_value) worst_item_value = itval; i_add((*items)[pickup[i]]); } - for (int i = 0; i < pickup.size(); i++) { + for (unsigned int i = 0; i < pickup.size(); i++) { g->m.i_rem(itx, ity, pickup[i]); for (int j = i + 1; j < pickup.size(); j++) // Fix indices pickup[j]--; @@ -1248,7 +1248,7 @@ void npc::drop_items(game *g, int weight, int volume) vol_ratio = inv[i].volume() / value(inv[i]); } bool added_wgt = false, added_vol = false; - for (int j = 0; j < rWgt.size() && !added_wgt; j++) { + for (unsigned int j = 0; j < rWgt.size() && !added_wgt; j++) { if (wgt_ratio > rWgt[j].ratio) { added_wgt = true; rWgt.insert(rWgt.begin() + j, ratio_index(wgt_ratio, i)); @@ -1256,7 +1256,7 @@ void npc::drop_items(game *g, int weight, int volume) } if (!added_wgt) rWgt.push_back(ratio_index(wgt_ratio, i)); - for (int j = 0; j < rVol.size() && !added_vol; j++) { + for (unsigned int j = 0; j < rVol.size() && !added_vol; j++) { if (vol_ratio > rVol[j].ratio) { added_vol = true; rVol.insert(rVol.begin() + j, ratio_index(vol_ratio, i)); @@ -1280,7 +1280,7 @@ void npc::drop_items(game *g, int weight, int volume) index = rWgt[0].index; rWgt.erase(rWgt.begin()); // Fix the rest of those indices. - for (int i = 0; i < rWgt.size(); i++) { + for (unsigned int i = 0; i < rWgt.size(); i++) { if (rWgt[i].index > index) rWgt[i].index--; } @@ -1288,7 +1288,7 @@ void npc::drop_items(game *g, int weight, int volume) index = rVol[0].index; rVol.erase(rVol.begin()); // Fix the rest of those indices. - for (int i = 0; i < rVol.size(); i++) { + for (unsigned int i = 0; i < rVol.size(); i++) { if (i > rVol.size()) debugmsg("npc::drop_items() - looping through rVol - Size is %d, i is %d", rVol.size(), i); @@ -1336,7 +1336,7 @@ npc_action npc::scan_new_items(game *g, int target) } bool has_ammo_for_empty_gun = false; - for (int i = 0; i < empty_guns.size(); i++) { + for (unsigned int i = 0; i < empty_guns.size(); i++) { for (int j = 0; j < inv.size(); j++) { if (inv[j].is_ammo() && inv[j].ammo_type() == inv[ empty_guns[i] ].ammo_type()) diff --git a/npctalk.cpp b/npctalk.cpp index 3ecd83e3b5f63..e19f38ff5942b 100644 --- a/npctalk.cpp +++ b/npctalk.cpp @@ -75,7 +75,7 @@ void npc::talk_to_u(game *g) d.topic_stack.push_back(TALK_FRIEND); int most_difficult_mission = 0; - for (int i = 0; i < chatbin.missions.size(); i++) { + for (unsigned int i = 0; i < chatbin.missions.size(); i++) { mission_type *type = g->find_mission_type(chatbin.missions[i]); if (type->urgent && type->difficulty > most_difficult_mission) { d.topic_stack.push_back(TALK_MISSION_DESCRIBE); @@ -85,7 +85,7 @@ void npc::talk_to_u(game *g) } most_difficult_mission = 0; bool chosen_urgent = false; - for (int i = 0; i < chatbin.missions_assigned.size(); i++) { + for (unsigned int i = 0; i < chatbin.missions_assigned.size(); i++) { mission_type *type = g->find_mission_type(chatbin.missions_assigned[i]); if ((type->urgent && !chosen_urgent) || (type->difficulty > most_difficult_mission && @@ -456,7 +456,7 @@ std::vector gen_responses(talk_topic topic, game *g, npc *p) RESPONSE("Never mind, I'm not interested."); SUCCESS(TALK_NONE); } else { - for (int i = 0; i < p->chatbin.missions.size(); i++) { + for (unsigned int i = 0; i < p->chatbin.missions.size(); i++) { SELECT_MISS(g->find_mission_type( p->chatbin.missions[i] )->name, i); SUCCESS(TALK_MISSION_OFFER); } @@ -475,7 +475,7 @@ std::vector gen_responses(talk_topic topic, game *g, npc *p) RESPONSE("Never mind."); SUCCESS(TALK_NONE); } else { - for (int i = 0; i < p->chatbin.missions_assigned.size(); i++) { + for (unsigned int i = 0; i < p->chatbin.missions_assigned.size(); i++) { SELECT_MISS(g->find_mission_type( p->chatbin.missions_assigned[i] )->name, i); SUCCESS(TALK_MISSION_INQUIRE); @@ -738,7 +738,7 @@ std::vector gen_responses(talk_topic topic, game *g, npc *p) int printed = 0; int shift = p->chatbin.tempvalue; bool more = trainable.size() + styles.size() - shift > 9; - for (int i = shift; i < trainable.size() && printed < 9; i++) { + for (unsigned int i = shift; i < trainable.size() && printed < 9; i++) { //shift--; printed++; std::stringstream skilltext; @@ -752,7 +752,7 @@ std::vector gen_responses(talk_topic topic, game *g, npc *p) } if (shift < 0) shift = 0; - for (int i = 0; i < styles.size() && printed < 9; i++) { + for (unsigned int i = 0; i < styles.size() && printed < 9; i++) { printed++; SELECT_TEMP( g->itypes[styles[i]]->name + " (cost 800)", 0 - styles[i] ); @@ -1549,7 +1549,7 @@ talk_topic dialogue::opt(talk_topic topic, game *g) std::vector options; std::vector colors; - for (int i = 0; i < responses.size(); i++) { + for (unsigned int i = 0; i < responses.size(); i++) { std::stringstream text; text << char('a' + i) << ": "; if (responses[i].trial != TALK_TRIAL_NONE) @@ -1588,7 +1588,7 @@ talk_topic dialogue::opt(talk_topic topic, game *g) } curline = 3; - for (int i = 0; i < options.size(); i++) { + for (unsigned int i = 0; i < options.size(); i++) { while (options[i].size() > 36) { split = options[i].find_last_of(' ', 36); mvwprintz(win, curline, 42, colors[i], options[i].substr(0, split).c_str()); @@ -1711,12 +1711,12 @@ Tab key to switch lists, letters to pick items, Enter to finalize, Esc to quit\n bool getting_theirs[theirs.size()], getting_yours[yours.size()]; // Adjust the prices based on your barter skill. - for (int i = 0; i < their_price.size(); i++) { + for (unsigned int i = 0; i < their_price.size(); i++) { their_price[i] *= (price_adjustment(g->u.sklevel[sk_barter]) + (p->int_cur - g->u.int_cur) / 15); getting_theirs[i] = false; } - for (int i = 0; i < your_price.size(); i++) { + for (unsigned int i = 0; i < your_price.size(); i++) { your_price[i] /= (price_adjustment(g->u.sklevel[sk_barter]) + (p->int_cur - g->u.int_cur) / 15); getting_yours[i] = false; @@ -1757,7 +1757,7 @@ Tab key to switch lists, letters to pick items, Enter to finalize, Esc to quit\n mvwprintz(w_you, 0, 2, (cash > 0 || g->u.cash>=cash*-1 ? c_green:c_red), "You: $%d", g->u.cash); // Draw their list of items, starting from them_off - for (int i = them_off; i < theirs.size() && i < 17; i++) + for (unsigned int i = them_off; i < theirs.size() && i < 17; i++) mvwprintz(w_them, i - them_off + 1, 1, (getting_theirs[i] ? c_white : c_ltgray), "%c %c %s - $%d", char(i + 'a'), (getting_theirs[i] ? '+' : '-'), @@ -1768,7 +1768,7 @@ Tab key to switch lists, letters to pick items, Enter to finalize, Esc to quit\n if (them_off + 17 < theirs.size()) mvwprintw(w_them, 19, 9, "More >"); // Draw your list of items, starting from you_off - for (int i = you_off; i < yours.size() && i < 17; i++) + for (unsigned int i = you_off; i < yours.size() && i < 17; i++) mvwprintz(w_you, i - you_off + 1, 1, (getting_yours[i] ? c_white : c_ltgray), "%c %c %s - $%d", char(i + 'a'), (getting_yours[i] ? '+' : '-'), @@ -1873,7 +1873,7 @@ Tab key to switch lists, letters to pick items, Enter to finalize, Esc to quit\n inventory newinv; int practice = 0; std::vector removing; - for (int i = 0; i < yours.size(); i++) { + for (unsigned int i = 0; i < yours.size(); i++) { if (getting_yours[i]) { newinv.push_back(g->u.inv[yours[i]]); practice++; @@ -1881,10 +1881,10 @@ Tab key to switch lists, letters to pick items, Enter to finalize, Esc to quit\n } } // Do it in two passes, so removing items doesn't corrupt yours[] - for (int i = 0; i < removing.size(); i++) + for (unsigned int i = 0; i < removing.size(); i++) g->u.i_rem(removing[i]); - for (int i = 0; i < theirs.size(); i++) { + for (unsigned int i = 0; i < theirs.size(); i++) { item tmp = p->inv[theirs[i]]; if (getting_theirs[i]) { practice += 2; diff --git a/output.cpp b/output.cpp index 47df1e44c81a6..0af72ce1638b7 100644 --- a/output.cpp +++ b/output.cpp @@ -256,7 +256,7 @@ void draw_tabs(WINDOW *w, int active_tab, ...) mvwputch(w, 2, x, c_white, LINE_OXOX); int total_width = 0; - for (int i = 0; i < labels.size(); i++) + for (unsigned int i = 0; i < labels.size(); i++) total_width += labels[i].length() + 6; // "< |four| >" if (total_width > win_width) { @@ -272,7 +272,7 @@ void draw_tabs(WINDOW *w, int active_tab, ...) int xpos = 0; double savings = 0; - for (int i = 0; i < labels.size(); i++) { + for (unsigned int i = 0; i < labels.size(); i++) { int length = labels[i].length(); xpos += buffer + 2; savings += buffer_extra; @@ -482,7 +482,7 @@ int menu_vec(const char *mes, std::vector options) } std::string title = mes; int height = 3 + options.size(), width = title.length() + 2; - for (int i = 0; i < options.size(); i++) { + for (unsigned int i = 0; i < options.size(); i++) { if (options[i].length() + 6 > width) width = options[i].length() + 6; } @@ -491,7 +491,7 @@ int menu_vec(const char *mes, std::vector options) wborder(w, LINE_XOXO, LINE_XOXO, LINE_OXOX, LINE_OXOX, LINE_OXXO, LINE_OOXX, LINE_XXOO, LINE_XOOX ); mvwprintw(w, 1, 1, title.c_str()); - for (int i = 0; i < options.size(); i++) + for (unsigned int i = 0; i < options.size(); i++) mvwprintw(w, i + 2, 1, "%c: %s", (i < 9? i + '1' : (i == 9? '0' : 'a' + i - 10)), options[i].c_str()); @@ -726,7 +726,7 @@ void compare_split_screen_popup(bool bLeft, std::string sItemName, std::vector overmap::monsters_at(int x, int y) std::vector ret; if (x < 0 || x >= OMAPX || y < 0 || y >= OMAPY) return ret; - for (int i = 0; i < zg.size(); i++) { + for (unsigned int i = 0; i < zg.size(); i++) { if (trig_dist(x, y, zg[i].posx, zg[i].posy) <= zg[i].radius) ret.push_back(&(zg[i])); } @@ -187,7 +187,7 @@ bool overmap::is_safe(int x, int y) return true; bool safe = true; - for (int n = 0; n < mons.size() && safe; n++) + for (unsigned int n = 0; n < mons.size() && safe; n++) safe = mons[n]->is_safe(); return safe; @@ -205,7 +205,7 @@ bool& overmap::seen(int x, int y) bool overmap::has_note(int x, int y) { - for (int i = 0; i < notes.size(); i++) { + for (unsigned int i = 0; i < notes.size(); i++) { if (notes[i].x == x && notes[i].y == y) return true; } @@ -214,7 +214,7 @@ bool overmap::has_note(int x, int y) std::string overmap::note(int x, int y) { - for (int i = 0; i < notes.size(); i++) { + for (unsigned int i = 0; i < notes.size(); i++) { if (notes[i].x == x && notes[i].y == y) return notes[i].text; } @@ -223,7 +223,7 @@ std::string overmap::note(int x, int y) void overmap::add_note(int x, int y, std::string message) { - for (int i = 0; i < notes.size(); i++) { + for (unsigned int i = 0; i < notes.size(); i++) { if (notes[i].x == x && notes[i].y == y) { if (message == "") notes.erase(notes.begin() + i); @@ -240,7 +240,7 @@ point overmap::find_note(point origin, std::string text) { int closest = 9999; point ret(-1, -1); - for (int i = 0; i < notes.size(); i++) { + for (unsigned int i = 0; i < notes.size(); i++) { if (notes[i].text.find(text) != std::string::npos && rl_dist(origin.x, origin.y, notes[i].x, notes[i].y) < closest) { closest = rl_dist(origin.x, origin.y, notes[i].x, notes[i].y); @@ -346,7 +346,7 @@ void overmap::generate(game * /*g*/, overmap* north, overmap* east, overmap* sou river_start.push_back(point(i, 0)); } } - for (int i = 0; i < north->roads_out.size(); i++) { + for (unsigned int i = 0; i < north->roads_out.size(); i++) { if (north->roads_out[i].y == OMAPY - 1) roads_out.push_back(city(north->roads_out[i].x, 0, 0)); } @@ -364,7 +364,7 @@ void overmap::generate(game * /*g*/, overmap* north, overmap* east, overmap* sou river_start.push_back(point(0, i)); } } - for (int i = 0; i < west->roads_out.size(); i++) { + for (unsigned int i = 0; i < west->roads_out.size(); i++) { if (west->roads_out[i].x == OMAPX - 1) roads_out.push_back(city(0, west->roads_out[i].y, 0)); } @@ -383,7 +383,7 @@ void overmap::generate(game * /*g*/, overmap* north, overmap* east, overmap* sou if (south->ter(i, 0) == ot_road_nesw) roads_out.push_back(city(i, OMAPY - 1, 0)); } - for (int i = 0; i < south->roads_out.size(); i++) { + for (unsigned int i = 0; i < south->roads_out.size(); i++) { if (south->roads_out[i].y == 0) roads_out.push_back(city(south->roads_out[i].x, OMAPY - 1, 0)); } @@ -403,7 +403,7 @@ void overmap::generate(game * /*g*/, overmap* north, overmap* east, overmap* sou if (east->ter(0, i) == ot_road_nesw) roads_out.push_back(city(OMAPX - 1, i, 0)); } - for (int i = 0; i < east->roads_out.size(); i++) { + for (unsigned int i = 0; i < east->roads_out.size(); i++) { if (east->roads_out[i].x == 0) roads_out.push_back(city(OMAPX - 1, east->roads_out[i].y, 0)); } @@ -462,7 +462,7 @@ void overmap::generate(game * /*g*/, overmap* north, overmap* east, overmap* sou if (river_start.size() != river_end.size()) river_start.push_back( point(rng(OMAPX * .25, OMAPX * .75), rng(OMAPY * .25, OMAPY * .75))); - for (int i = 0; i < river_start.size(); i++) + for (unsigned int i = 0; i < river_start.size(); i++) place_river(river_start[i], river_end[i]); } @@ -513,16 +513,16 @@ void overmap::generate(game * /*g*/, overmap* north, overmap* east, overmap* sou } } // Compile our master list of roads; it's less messy if roads_out is first - for (int i = 0; i < roads_out.size(); i++) + for (unsigned int i = 0; i < roads_out.size(); i++) road_points.push_back(roads_out[i]); - for (int i = 0; i < cities.size(); i++) + for (unsigned int i = 0; i < cities.size(); i++) road_points.push_back(cities[i]); // And finally connect them via "highways" place_hiways(road_points, ot_road_null); // Place specials place_specials(); // Make the roads out road points; - for (int i = 0; i < roads_out.size(); i++) + for (unsigned int i = 0; i < roads_out.size(); i++) ter(roads_out[i].x, roads_out[i].y) = ot_road_nesw; // Clean up our roads and rivers polish(); @@ -645,20 +645,20 @@ void overmap::generate_sub(overmap* above) } } - for (int i = 0; i < goo_points.size(); i++) + for (unsigned int i = 0; i < goo_points.size(); i++) build_slimepit(goo_points[i].x, goo_points[i].y, goo_points[i].s); place_hiways(sewer_points, ot_sewer_nesw); polish(ot_sewer_ns, ot_sewer_nesw); place_hiways(subway_points, ot_subway_nesw); - for (int i = 0; i < subway_points.size(); i++) + for (unsigned int i = 0; i < subway_points.size(); i++) ter(subway_points[i].x, subway_points[i].y) = ot_subway_station; - for (int i = 0; i < lab_points.size(); i++) + for (unsigned int i = 0; i < lab_points.size(); i++) build_lab(lab_points[i].x, lab_points[i].y, lab_points[i].s); - for (int i = 0; i < ant_points.size(); i++) + for (unsigned int i = 0; i < ant_points.size(); i++) build_anthill(ant_points[i].x, ant_points[i].y, ant_points[i].s); polish(ot_subway_ns, ot_subway_nesw); polish(ot_ants_ns, ot_ants_nesw); - for (int i = 0; i < above->cities.size(); i++) { + for (unsigned int i = 0; i < above->cities.size(); i++) { if (one_in(3)) zg.push_back( mongroup(mcat_chud, above->cities[i].x * 2, above->cities[i].y * 2, @@ -669,7 +669,7 @@ void overmap::generate_sub(overmap* above) above->cities[i].s * 3.5, above->cities[i].s * 70)); } place_rifts(); - for (int i = 0; i < mine_points.size(); i++) + for (unsigned int i = 0; i < mine_points.size(); i++) build_mine(mine_points[i].x, mine_points[i].y, mine_points[i].s); // Basements done last so sewers, etc. don't overwrite them for (int i = 0; i < OMAPX; i++) { @@ -680,26 +680,26 @@ void overmap::generate_sub(overmap* above) } } - for (int i = 0; i < shaft_points.size(); i++) + for (unsigned int i = 0; i < shaft_points.size(); i++) ter(shaft_points[i].x, shaft_points[i].y) = ot_mine_shaft; - for (int i = 0; i < bunker_points.size(); i++) + for (unsigned int i = 0; i < bunker_points.size(); i++) ter(bunker_points[i].x, bunker_points[i].y) = ot_bunker; - for (int i = 0; i < shelter_points.size(); i++) + for (unsigned int i = 0; i < shelter_points.size(); i++) ter(shelter_points[i].x, shelter_points[i].y) = ot_shelter_under; - for (int i = 0; i < lmoe_points.size(); i++) + for (unsigned int i = 0; i < lmoe_points.size(); i++) ter(lmoe_points[i].x, lmoe_points[i].y) = ot_lmoe_under; - for (int i = 0; i < triffid_points.size(); i++) { + for (unsigned int i = 0; i < triffid_points.size(); i++) { if (posz == -1) ter( triffid_points[i].x, triffid_points[i].y ) = ot_triffid_roots; else ter( triffid_points[i].x, triffid_points[i].y ) = ot_triffid_finale; } - for (int i = 0; i < temple_points.size(); i++) { + for (unsigned int i = 0; i < temple_points.size(); i++) { if (posz == -5) ter( temple_points[i].x, temple_points[i].y ) = ot_temple_finale; else @@ -808,7 +808,7 @@ std::vector overmap::find_terrain(std::string term, int /*cursx*/, int /* int overmap::closest_city(point p) { int distance = 999, ret = -1; - for (int i = 0; i < cities.size(); i++) { + for (unsigned int i = 0; i < cities.size(); i++) { int dist = rl_dist(p.x, p.y, cities[i].x, cities[i].y); if (dist < distance || (dist == distance && cities[i].s < cities[ret].s)) { ret = i; @@ -846,7 +846,7 @@ point overmap::random_house_in_city(int city_id) int overmap::dist_from_city(point p) { int distance = 999; - for (int i = 0; i < cities.size(); i++) { + for (unsigned int i = 0; i < cities.size(); i++) { int dist = rl_dist(p.x, p.y, cities[i].x, cities[i].y); dist -= cities[i].s; if (dist < distance) @@ -909,7 +909,7 @@ void overmap::draw(WINDOW *w, game *g, int &cursx, int &cursy, see = seen(omx, omy); if (note_here == has_note(omx, omy)) note_text = note(omx, omy); - for (int n = 0; n < npcs.size(); n++) { + for (unsigned int n = 0; n < npcs.size(); n++) { if ((npcs[n].mapx + 1) / 2 == omx && (npcs[n].mapy + 1) / 2 == omy) { npc_here = true; npc_name = npcs[n].name; @@ -1017,13 +1017,13 @@ void overmap::draw(WINDOW *w, game *g, int &cursx, int &cursy, } if (has_note(cursx, cursy)) { note_text = note(cursx, cursy); - for (int i = 0; i < note_text.length(); i++) + for (unsigned int i = 0; i < note_text.length(); i++) mvwputch(w, 1, i, c_white, LINE_OXOX); mvwputch(w, 1, note_text.length(), c_white, LINE_XOOX); mvwputch(w, 0, note_text.length(), c_white, LINE_XOXO); mvwprintz(w, 0, 0, c_yellow, note_text.c_str()); } else if (npc_here) { - for (int i = 0; i < npc_name.length(); i++) + for (unsigned int i = 0; i < npc_name.length(); i++) mvwputch(w, 1, i, c_white, LINE_OXOX); mvwputch(w, 1, npc_name.length(), c_white, LINE_XOOX); mvwputch(w, 0, npc_name.length(), c_white, LINE_XOXO); @@ -1209,7 +1209,7 @@ void overmap::first_house(int &x, int &y) void overmap::process_mongroups() { - for (int i = 0; i < zg.size(); i++) { + for (unsigned int i = 0; i < zg.size(); i++) { if (zg[i].dying) { zg[i].population *= .8; zg[i].radius *= .9; @@ -1229,7 +1229,7 @@ void overmap::place_forest() fory = rng(0, OMAPY - 1); // fors determinds its basic size fors = rng(15, 40); - for (int j = 0; j < cities.size(); j++) { + for (unsigned int j = 0; j < cities.size(); j++) { while (dist(forx,fory,cities[j].x,cities[j].y) - fors / 2 < cities[j].s ) { // Set forx and fory far enough from cities forx = rng(0, OMAPX - 1); @@ -1606,7 +1606,7 @@ void overmap::build_tunnel(int x, int y, int s, int dir) valid.push_back(point(i, j)); } } - for (int i = 0; i < valid.size(); i++) { + for (unsigned int i = 0; i < valid.size(); i++) { if (valid[i].x != next.x || valid[i].y != next.y) { if (one_in(s * 2)) { if (one_in(2)) @@ -1683,7 +1683,7 @@ void overmap::place_rifts() riftline = line_to(x - xdist, y - ydist+o, x + xdist, y + ydist, rng(0,10)); else riftline = line_to(x - xdist+o, y - ydist, x + xdist, y + ydist, rng(0,10)); - for (int i = 0; i < riftline.size(); i++) { + for (unsigned int i = 0; i < riftline.size(); i++) { if (i == riftline.size() / 2 && !one_in(3)) ter(riftline[i].x, riftline[i].y) = ot_hellmouth; else @@ -1716,7 +1716,7 @@ void overmap::make_hiway(int x1, int y1, int x2, int y2, oter_id base) next.push_back(point(x, y + 1)); else if (y2 < y) next.push_back(point(x, y - 1)); - for (int i = 0; i < next.size(); i++) { // Take an existing road if we can + for (unsigned int i = 0; i < next.size(); i++) { // Take an existing road if we can if (next[i].x != -1 && is_road(base, next[i].x, next[i].y)) { x = next[i].x; y = next[i].y; @@ -1854,10 +1854,10 @@ void overmap::place_hiways(std::vector cities, oter_id base) int closest = -1; int distance; bool maderoad = false; - for (int i = 0; i < cities.size(); i++) { + for (unsigned int i = 0; i < cities.size(); i++) { maderoad = false; closest = -1; - for (int j = i + 1; j < cities.size(); j++) { + for (unsigned int j = i + 1; j < cities.size(); j++) { distance = dist(cities[i].x, cities[i].y, cities[j].x, cities[j].y); if (distance < closest || closest < 0) { closest = distance; @@ -1938,7 +1938,7 @@ bool overmap::is_road(int x, int y) if (ter(x, y) == ot_rift || ter(x, y) == ot_hellmouth) return true; if (x < 0 || x >= OMAPX || y < 0 || y >= OMAPY) { - for (int i = 0; i < roads_out.size(); i++) { + for (unsigned int i = 0; i < roads_out.size(); i++) { if (abs(roads_out[i].x - x) + abs(roads_out[i].y - y) <= 1) return true; } @@ -1975,7 +1975,7 @@ bool overmap::is_road(oter_id base, int x, int y) return false; } if (x < 0 || x >= OMAPX || y < 0 || y >= OMAPY) { - for (int i = 0; i < roads_out.size(); i++) { + for (unsigned int i = 0; i < roads_out.size(); i++) { if (abs(roads_out[i].x - x) + abs(roads_out[i].y - y) <= 1) return true; } @@ -2148,7 +2148,7 @@ void overmap::place_specials() if (tries < 15) { // We found a valid spot! // Place the MUST HAVE ones first, to try and guarantee that they appear std::vector must_place; - for (int i = 0; i < valid.size(); i++) { + for (unsigned int i = 0; i < valid.size(); i++) { if (placed[i] < overmap_specials[ valid[i] ].min_appearances) must_place.push_back(valid[i]); } @@ -2256,7 +2256,7 @@ void overmap::place_special(overmap_special special, point p) if (special.flags & mfb(OMS_FLAG_ROAD)) { int closest = -1, distance = 999; - for (int i = 0; i < cities.size(); i++) { + for (unsigned int i = 0; i < cities.size(); i++) { int dist = rl_dist(p.x, p.y, cities[i].x, cities[i].y); if (dist < distance) { closest = i; @@ -2268,7 +2268,7 @@ void overmap::place_special(overmap_special special, point p) if (special.flags & mfb(OMS_FLAG_PARKING_LOT)) { int closest = -1, distance = 999; - for (int i = 0; i < cities.size(); i++) { + for (unsigned int i = 0; i < cities.size(); i++) { int dist = rl_dist(p.x, p.y, cities[i].x, cities[i].y); if (dist < distance) { closest = i; @@ -2280,7 +2280,7 @@ void overmap::place_special(overmap_special special, point p) } if (special.flags & mfb(OMS_FLAG_DIRT_LOT)) { int closest = -1, distance = 999; - for (int i = 0; i < cities.size(); i++) { + for (unsigned int i = 0; i < cities.size(); i++) { int dist = rl_dist(p.x, p.y, cities[i].x, cities[i].y); if (dist < distance) { closest = i; @@ -2312,7 +2312,7 @@ void overmap::place_special(overmap_special special, point p) void overmap::place_mongroups() { // Cities are full of zombies - for (int i = 0; i < cities.size(); i++) { + for (unsigned int i = 0; i < cities.size(); i++) { if (!one_in(16) || cities[i].s > 5) zg.push_back( mongroup(mcat_zombie, (cities[i].x * 2), (cities[i].y * 2), @@ -2422,7 +2422,7 @@ void overmap::save(std::string name, int x, int y, int z) } fout << std::endl; } - for (int i = 0; i < notes.size(); i++) + for (unsigned int i = 0; i < notes.size(); i++) fout << "N " << notes[i].x << " " << notes[i].y << " " << notes[i].num << std::endl << notes[i].text << std::endl; fout.close(); @@ -2432,21 +2432,21 @@ void overmap::save(std::string name, int x, int y, int z) fout << char(int(ter(i, j)) + 32); } fout << std::endl; - for (int i = 0; i < zg.size(); i++) + for (unsigned int i = 0; i < zg.size(); i++) fout << "Z " << zg[i].type << " " << zg[i].posx << " " << zg[i].posy << " " << int(zg[i].radius) << " " << zg[i].population << " " << zg[i].diffuse << std::endl; - for (int i = 0; i < cities.size(); i++) + for (unsigned int i = 0; i < cities.size(); i++) fout << "t " << cities[i].x << " " << cities[i].y << " " << cities[i].s << std::endl; - for (int i = 0; i < roads_out.size(); i++) + for (unsigned int i = 0; i < roads_out.size(); i++) fout << "R " << roads_out[i].x << " " << roads_out[i].y << std::endl; - for (int i = 0; i < radios.size(); i++) + for (unsigned int i = 0; i < radios.size(); i++) fout << "T " << radios[i].x << " " << radios[i].y << " " << radios[i].strength << " " << std::endl << radios[i].message << std::endl; - for (int i = 0; i < npcs.size(); i++) + for (unsigned int i = 0; i < npcs.size(); i++) fout << "n " << npcs[i].save_info() << std::endl; fout.close(); diff --git a/player.cpp b/player.cpp index c4e6dcdc36439..2bf57fcec990a 100644 --- a/player.cpp +++ b/player.cpp @@ -332,7 +332,7 @@ if (has_bionic(bio_metabolics) && power_level < max_power_level && void player::update_morale() { - for (int i = 0; i < morale.size(); i++) { + for (unsigned int i = 0; i < morale.size(); i++) { if (morale[i].bonus < 0) morale[i].bonus++; else if (morale[i].bonus > 0) @@ -414,7 +414,7 @@ int player::current_speed(game *g) newmoves += (stim > 40 ? 40 : stim); - for (int i = 0; i < illness.size(); i++) + for (unsigned int i = 0; i < illness.size(); i++) newmoves += disease_speed_boost(illness[i]); if (has_trait(PF_QUICK)) @@ -501,7 +501,7 @@ int player::swim_speed() ret += (50 - skillLevel("swimming").level() * 2) * abs(encumb(bp_legs)); ret += (80 - skillLevel("swimming").level() * 3) * abs(encumb(bp_torso)); if (skillLevel("swimming") < 10) { - for (int i = 0; i < worn.size(); i++) + for (unsigned int i = 0; i < worn.size(); i++) ret += (worn[i].volume() * (10 - skillLevel("swimming").level())) / 2; } ret -= str_cur * 6 + dex_cur * 4; @@ -665,25 +665,25 @@ std::string player::save_info() } dump << styles.size() << " "; - for (int i = 0; i < styles.size(); i++) + for (unsigned int i = 0; i < styles.size(); i++) dump << int(styles[i]) << " "; dump << illness.size() << " "; - for (int i = 0; i < illness.size(); i++) + for (unsigned int i = 0; i < illness.size(); i++) dump << int(illness[i].type) << " " << illness[i].duration << " "; dump << addictions.size() << " "; - for (int i = 0; i < addictions.size(); i++) + for (unsigned int i = 0; i < addictions.size(); i++) dump << int(addictions[i].type) << " " << addictions[i].intensity << " " << addictions[i].sated << " "; dump << my_bionics.size() << " "; - for (int i = 0; i < my_bionics.size(); i++) + for (unsigned int i = 0; i < my_bionics.size(); i++) dump << int(my_bionics[i].id) << " " << my_bionics[i].invlet << " " << my_bionics[i].powered << " " << my_bionics[i].charge << " "; dump << morale.size() << " "; - for (int i = 0; i < morale.size(); i++) { + for (unsigned int i = 0; i < morale.size(); i++) { dump << morale[i].bonus << " " << morale[i].type << " "; if (morale[i].item_type == NULL) dump << "0"; @@ -693,31 +693,31 @@ std::string player::save_info() } dump << " " << active_missions.size() << " "; - for (int i = 0; i < active_missions.size(); i++) + for (unsigned int i = 0; i < active_missions.size(); i++) dump << active_missions[i] << " "; dump << " " << completed_missions.size() << " "; - for (int i = 0; i < completed_missions.size(); i++) + for (unsigned int i = 0; i < completed_missions.size(); i++) dump << completed_missions[i] << " "; dump << " " << failed_missions.size() << " "; - for (int i = 0; i < failed_missions.size(); i++) + for (unsigned int i = 0; i < failed_missions.size(); i++) dump << failed_missions[i] << " "; dump << std::endl; for (int i = 0; i < inv.size(); i++) { - for (int j = 0; j < inv.stack_at(i).size(); j++) { + for (unsigned int j = 0; j < inv.stack_at(i).size(); j++) { dump << "I " << inv.stack_at(i)[j].save_info() << std::endl; - for (int k = 0; k < inv.stack_at(i)[j].contents.size(); k++) + for (unsigned int k = 0; k < inv.stack_at(i)[j].contents.size(); k++) dump << "C " << inv.stack_at(i)[j].contents[k].save_info() << std::endl; } } - for (int i = 0; i < worn.size(); i++) + for (unsigned int i = 0; i < worn.size(); i++) dump << "W " << worn[i].save_info() << std::endl; if (!weapon.is_null()) dump << "w " << weapon.save_info() << std::endl; - for (int j = 0; j < weapon.contents.size(); j++) + for (unsigned int j = 0; j < weapon.contents.size(); j++) dump << "c " << weapon.contents[j].save_info() << std::endl; return dump.str(); @@ -728,7 +728,7 @@ void player::disp_info(game *g) int line; std::vector effect_name; std::vector effect_text; - for (int i = 0; i < illness.size(); i++) { + for (unsigned int i = 0; i < illness.size(); i++) { if (dis_name(illness[i]).size() > 0) { effect_name.push_back(dis_name(illness[i])); effect_text.push_back(dis_description(illness[i])); @@ -811,7 +811,7 @@ Strength - 2; Dexterity - 2; Intelligence - 2; Dexterity - 2"); Strength - 4; Dexterity - 4; Intelligence - 4; Dexterity - 4"); } - for (int i = 0; i < addictions.size(); i++) { + for (unsigned int i = 0; i < addictions.size(); i++) { if (addictions[i].sated < 0 && addictions[i].intensity >= MIN_ADDICTION_LEVEL) { effect_name.push_back(addiction_name(addictions[i])); @@ -960,7 +960,7 @@ Strength - 4; Dexterity - 4; Intelligence - 4; Dexterity - 4"); // Next, draw effects. line = 2; mvwprintz(w_effects, 0, 8, c_ltgray, "EFFECTS"); - for (int i = 0; i < effect_name.size() && line < 9; i++) { + for (unsigned int i = 0; i < effect_name.size() && line < 9; i++) { mvwprintz(w_effects, line, 1, c_ltgray, effect_name[i].c_str()); line++; } @@ -1074,7 +1074,7 @@ Strength - 4; Dexterity - 4; Intelligence - 4; Dexterity - 4"); line++; } - for (int i = 0; i < illness.size(); i++) { + for (unsigned int i = 0; i < illness.size(); i++) { int move_adjust = disease_speed_boost(illness[i]); if (move_adjust != 0) { nc_color col = (move_adjust > 0 ? c_green : c_red); @@ -1293,7 +1293,7 @@ encumb(bp_feet) * 5); break; case '\t': mvwprintz(w_traits, 0, 0, c_ltgray, " TRAITS "); - for (int i = 0; i < traitslist.size() && i < 7; i++) { + for (unsigned int i = 0; i < traitslist.size() && i < 7; i++) { mvwprintz(w_traits, i + 2, 1, c_black, "xxxxxxxxxxxxxxxxxxxxxxxxx"); if (traitslist[i] > PF_MAX2) status = c_ltblue; @@ -1350,7 +1350,7 @@ encumb(bp_feet) * 5); break; case '\t': mvwprintz(w_effects, 0, 0, c_ltgray, " EFFECTS "); - for (int i = 0; i < effect_name.size() && i < 7; i++) + for (unsigned int i = 0; i < effect_name.size() && i < 7; i++) mvwprintz(w_effects, i + 2, 1, c_ltgray, effect_name[i].c_str()); wrefresh(w_effects); line = 0; @@ -1436,7 +1436,7 @@ encumb(bp_feet) * 5); case '\t': werase(w_skills); mvwprintz(w_skills, 0, 0, c_ltgray, " SKILLS "); - for (int i = 0; i < skillslist.size() && i < 7; i++) { + for (unsigned int i = 0; i < skillslist.size() && i < 7; i++) { Skill *thisSkill = Skill::skill(i); SkillLevel thisLevel = skillLevel(thisSkill); if (thisLevel.exercise() < 0) @@ -1495,7 +1495,7 @@ void player::disp_morale() mvwprintz(w, 2, 1, c_ltgray, "Name"); mvwprintz(w, 2, 20, c_ltgray, "Value"); - for (int i = 0; i < morale.size(); i++) { + for (unsigned int i = 0; i < morale.size(); i++) { int b = morale[i].bonus; int bpos = 24; @@ -1647,7 +1647,7 @@ if (temp_cur[bp_torso] > BODYTEMP_SCORCHING) (strain <= 0.4? c_ltred : c_red)); bool has_turrets = false; - for (int p = 0; p < veh->parts.size(); p++) { + for (unsigned int p = 0; p < veh->parts.size(); p++) { if (veh->part_flag (p, vpf_turret)) { has_turrets = true; break; @@ -1744,7 +1744,7 @@ void player::toggle_trait(int flag) bool player::has_bionic(bionic_id b) { - for (int i = 0; i < my_bionics.size(); i++) { + for (unsigned int i = 0; i < my_bionics.size(); i++) { if (my_bionics[i].id == b) return true; } @@ -1753,7 +1753,7 @@ bool player::has_bionic(bionic_id b) bool player::has_active_bionic(bionic_id b) { - for (int i = 0; i < my_bionics.size(); i++) { + for (unsigned int i = 0; i < my_bionics.size(); i++) { if (my_bionics[i].id == b) return (my_bionics[i].powered); } @@ -1762,7 +1762,7 @@ bool player::has_active_bionic(bionic_id b) void player::add_bionic(bionic_id b) { - for (int i = 0; i < my_bionics.size(); i++) { + for (unsigned int i = 0; i < my_bionics.size(); i++) { if (my_bionics[i].id == b) return; // No duplicates! } @@ -1797,7 +1797,7 @@ void player::power_bionics(game *g) mvwputch(wBio, 1, i, c_ltgray, LINE_OXOX); mvwputch(wBio, 21, i, c_ltgray, LINE_OXOX); } - for (int i = 0; i < my_bionics.size(); i++) { + for (unsigned int i = 0; i < my_bionics.size(); i++) { if ( bionics[my_bionics[i].id].power_source || !bionics[my_bionics[i].id].activated ) passive.push_back(my_bionics[i]); @@ -1807,7 +1807,7 @@ void player::power_bionics(game *g) nc_color type; if (passive.size() > 0) { mvwprintz(wBio, 2, 0, c_ltblue, "Passive:"); - for (int i = 0; i < passive.size(); i++) { + for (unsigned int i = 0; i < passive.size(); i++) { if (bionics[passive[i].id].power_source) type = c_ltcyan; else @@ -1818,7 +1818,7 @@ void player::power_bionics(game *g) } if (active.size() > 0) { mvwprintz(wBio, 2, 32, c_ltblue, "Active:"); - for (int i = 0; i < active.size(); i++) { + for (unsigned int i = 0; i < active.size(); i++) { if (active[i].powered) type = c_red; else @@ -1850,7 +1850,7 @@ void player::power_bionics(game *g) } else if (ch == ' ') ch = KEY_ESCAPE; else if (ch != KEY_ESCAPE) { - for (int i = 0; i < my_bionics.size(); i++) { + for (unsigned int i = 0; i < my_bionics.size(); i++) { if (ch == my_bionics[i].invlet) { tmp = &my_bionics[i]; b = i; @@ -2590,7 +2590,7 @@ void player::add_disease(dis_type type, int duration, game *g, void player::rem_disease(dis_type type) { - for (int i = 0; i < illness.size(); i++) { + for (unsigned int i = 0; i < illness.size(); i++) { if (illness[i].type == type) illness.erase(illness.begin() + i); } @@ -2598,7 +2598,7 @@ void player::rem_disease(dis_type type) bool player::has_disease(dis_type type) { - for (int i = 0; i < illness.size(); i++) { + for (unsigned int i = 0; i < illness.size(); i++) { if (illness[i].type == type) return true; } @@ -2607,7 +2607,7 @@ bool player::has_disease(dis_type type) int player::disease_level(dis_type type) { - for (int i = 0; i < illness.size(); i++) { + for (unsigned int i = 0; i < illness.size(); i++) { if (illness[i].type == type) return illness[i].duration; } @@ -2616,7 +2616,7 @@ int player::disease_level(dis_type type) int player::disease_intensity(dis_type type) { - for (int i = 0; i < illness.size(); i++) { + for (unsigned int i = 0; i < illness.size(); i++) { if (illness[i].type == type) return illness[i].intensity; } @@ -2632,7 +2632,7 @@ void player::add_addiction(add_type type, int strength) strength = int(strength * 1.5); timer = 800; } - for (int i = 0; i < addictions.size(); i++) { + for (unsigned int i = 0; i < addictions.size(); i++) { if (addictions[i].type == type) { if (addictions[i].sated < 0) addictions[i].sated = timer; @@ -2654,7 +2654,7 @@ void player::add_addiction(add_type type, int strength) bool player::has_addiction(add_type type) { - for (int i = 0; i < addictions.size(); i++) { + for (unsigned int i = 0; i < addictions.size(); i++) { if (addictions[i].type == type && addictions[i].intensity >= MIN_ADDICTION_LEVEL) return true; @@ -2664,7 +2664,7 @@ bool player::has_addiction(add_type type) void player::rem_addiction(add_type type) { - for (int i = 0; i < addictions.size(); i++) { + for (unsigned int i = 0; i < addictions.size(); i++) { if (addictions[i].type == type) { addictions.erase(addictions.begin() + i); return; @@ -2674,7 +2674,7 @@ void player::rem_addiction(add_type type) int player::addiction_level(add_type type) { - for (int i = 0; i < addictions.size(); i++) { + for (unsigned int i = 0; i < addictions.size(); i++) { if (addictions[i].type == type) return addictions[i].intensity; } @@ -2683,7 +2683,7 @@ int player::addiction_level(add_type type) void player::suffer(game *g) { - for (int i = 0; i < my_bionics.size(); i++) { + for (unsigned int i = 0; i < my_bionics.size(); i++) { if (my_bionics[i].powered) activate_bionic(i, g); } @@ -2700,7 +2700,7 @@ void player::suffer(game *g) } } } - for (int i = 0; i < illness.size(); i++) { + for (unsigned int i = 0; i < illness.size(); i++) { dis_effect(g, *this, illness[i]); illness[i].duration--; if (illness[i].duration < MIN_DISEASE_AGE)// Cap permanent disease age @@ -2714,7 +2714,7 @@ void player::suffer(game *g) int timer = -3600; if (has_trait(PF_ADDICTIVE)) timer = -4000; - for (int i = 0; i < addictions.size(); i++) { + for (unsigned int i = 0; i < addictions.size(); i++) { if (addictions[i].sated <= 0 && addictions[i].intensity >= MIN_ADDICTION_LEVEL) addict_effect(g, addictions[i]); @@ -3023,7 +3023,7 @@ void player::vomit(game *g) hunger += rng(30, 50); thirst += rng(30, 50); moves -= 100; - for (int i = 0; i < illness.size(); i++) { + for (unsigned int i = 0; i < illness.size(); i++) { if (illness[i].type == DI_FOODPOISON) { illness[i].duration -= 300; if (illness[i].duration < 0) @@ -3044,10 +3044,10 @@ int player::weight_carried() { int ret = 0; ret += weapon.weight(); - for (int i = 0; i < worn.size(); i++) + for (unsigned int i = 0; i < worn.size(); i++) ret += worn[i].weight(); for (int i = 0; i < inv.size(); i++) { - for (int j = 0; j < inv.stack_at(i).size(); j++) + for (unsigned int j = 0; j < inv.stack_at(i).size(); j++) ret += inv.stack_at(i)[j].weight(); } return ret; @@ -3057,7 +3057,7 @@ int player::volume_carried() { int ret = 0; for (int i = 0; i < inv.size(); i++) { - for (int j = 0; j < inv.stack_at(i).size(); j++) + for (unsigned int j = 0; j < inv.stack_at(i).size(); j++) ret += inv.stack_at(i)[j].volume(); } return ret; @@ -3082,7 +3082,7 @@ int player::volume_capacity() { int ret = 2; // A small bonus (the overflow) it_armor *armor; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { armor = dynamic_cast(worn[i].type); ret += armor->storage; } @@ -3098,7 +3098,7 @@ int player::volume_capacity() int player::morale_level() { int ret = 0; - for (int i = 0; i < morale.size(); i++) + for (unsigned int i = 0; i < morale.size(); i++) ret += morale[i].bonus; if (has_trait(PF_HOARDER)) { @@ -3141,7 +3141,7 @@ void player::add_morale(morale_type type, int bonus, int max_bonus, { bool placed = false; - for (int i = 0; i < morale.size() && !placed; i++) { + for (unsigned int i = 0; i < morale.size() && !placed; i++) { if (morale[i].type == type && morale[i].item_type == item_type) { placed = true; if (abs(morale[i].bonus) < abs(max_bonus) || max_bonus == 0) { @@ -3183,7 +3183,7 @@ void player::sort_inv() } inv.clear(); for (int i = 0; i < 8; i++) { - for (int j = 0; j < types[i].size(); j++) + for (unsigned int j = 0; j < types[i].size(); j++) inv.push_back(types[i][j]); } inv_sorted = true; @@ -3241,7 +3241,7 @@ int player::active_item_charges(itype_id id) if (weapon.type->id == id && weapon.active) max = weapon.charges; for (int i = 0; i < inv.size(); i++) { - for (int j = 0; j < inv.stack_at(i).size(); j++) { + for (unsigned int j = 0; j < inv.stack_at(i).size(); j++) { if (inv.stack_at(i)[j].type->id == id && inv.stack_at(i)[j].active && inv.stack_at(i)[j].charges > max) max = inv.stack_at(i)[j].charges; @@ -3318,7 +3318,7 @@ void player::process_active_items(game *g) } } for (int i = 0; i < inv.size(); i++) { - for (int j = 0; j < inv.stack_at(i).size(); j++) { + for (unsigned int j = 0; j < inv.stack_at(i).size(); j++) { item *tmp_it = &(inv.stack_at(i)[j]); if (tmp_it->is_artifact() && tmp_it->is_tool()) g->process_artifact(tmp_it, this); @@ -3344,7 +3344,7 @@ void player::process_active_items(game *g) } } } - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (worn[i].is_artifact()) g->process_artifact(&(worn[i]), this); } @@ -3375,13 +3375,13 @@ void player::remove_mission_items(int mission_id) if (weapon.mission_id == mission_id) remove_weapon(); else { - for (int i = 0; i < weapon.contents.size(); i++) { + for (unsigned int i = 0; i < weapon.contents.size(); i++) { if (weapon.contents[i].mission_id == mission_id) remove_weapon(); } } for (int i = 0; i < inv.size(); i++) { - for (int j = 0; j < inv.stack_at(i).size() && j > 0; j++) { + for (unsigned int j = 0; j < inv.stack_at(i).size() && j > 0; j++) { if (inv.stack_at(i)[j].mission_id == mission_id) { if (inv.stack_at(i).size() == 1) { inv.remove_item(i, j); @@ -3393,7 +3393,7 @@ void player::remove_mission_items(int mission_id) } } else { bool rem = false; - for (int k = 0; !rem && k < inv.stack_at(i)[j].contents.size(); k++) { + for (unsigned int k = 0; !rem && k < inv.stack_at(i)[j].contents.size(); k++) { if (inv.stack_at(i)[j].contents[k].mission_id == mission_id) { if (inv.stack_at(i).size() == 1) { inv.remove_item(i, j); @@ -3421,7 +3421,7 @@ item player::i_rem(char let) weapon = ret_null; return tmp; } - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (worn[i].invlet == let) { tmp = worn[i]; worn.erase(worn.begin() + i); @@ -3451,7 +3451,7 @@ item& player::i_at(char let) return ret_null; if (weapon.invlet == let) return weapon; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (worn[i].invlet == let) return worn[i]; } @@ -3465,7 +3465,7 @@ item& player::i_of_type(itype_id type) { if (weapon.type->id == type) return weapon; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (worn[i].type->id == type) return worn[i]; } @@ -3481,10 +3481,10 @@ std::vector player::inv_dump() std::vector ret; if (weapon.type->id != 0 && weapon.type->id < num_items) ret.push_back(weapon); - for (int i = 0; i < worn.size(); i++) + for (unsigned int i = 0; i < worn.size(); i++) ret.push_back(worn[i]); for(int i = 0; i < inv.size(); i++) { - for (int j = 0; j < inv.stack_at(i).size(); j++) + for (unsigned int j = 0; j < inv.stack_at(i).size(); j++) ret.push_back(inv.stack_at(i)[j]); } return ret; @@ -3500,7 +3500,7 @@ item player::i_remn(int index) void player::use_amount(itype_id it, int quantity, bool use_container) { bool used_weapon_contents = false; - for (int i = 0; i < weapon.contents.size(); i++) { + for (unsigned int i = 0; i < weapon.contents.size(); i++) { if (weapon.contents[0].type->id == it) { quantity--; weapon.contents.erase(weapon.contents.begin() + 0); @@ -3528,7 +3528,7 @@ void player::use_charges(itype_id it, int quantity) return; } // Start by checking weapon contents - for (int i = 0; i < weapon.contents.size(); i++) { + for (unsigned int i = 0; i < weapon.contents.size(); i++) { if (weapon.contents[i].type->id == it) { if (weapon.contents[i].charges > 0 && weapon.contents[i].charges <= quantity) { @@ -3571,7 +3571,7 @@ int player::butcher_factor() if (has_bionic(bio_tools)) lowest_factor=100; for (int i = 0; i < inv.size(); i++) { - for (int j = 0; j < inv.stack_at(i).size(); j++) { + for (unsigned int j = 0; j < inv.stack_at(i).size(); j++) { item *cur_item = &(inv.stack_at(i)[j]); if (cur_item->damage_cut() >= 10 && !cur_item->has_flag(IF_SPEAR)) { int factor = cur_item->volume() * 5 - cur_item->weight() * 1.5 - @@ -3609,7 +3609,7 @@ int player::pick_usb() return -1; // None available! std::vector selections; - for (int i = 0; i < drives.size() && i < 9; i++) + for (unsigned int i = 0; i < drives.size() && i < 9; i++) selections.push_back( inv[drives[i]].tname() ); int select = menu_vec("Choose drive:", selections); @@ -3619,7 +3619,7 @@ int player::pick_usb() bool player::is_wearing(itype_id it) { - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (worn[i].type->id == it) return true; } @@ -3630,11 +3630,11 @@ bool player::has_artifact_with(art_effect_passive effect) { if (weapon.is_artifact() && weapon.is_tool()) { it_artifact_tool *tool = dynamic_cast(weapon.type); - for (int i = 0; i < tool->effects_wielded.size(); i++) { + for (unsigned int i = 0; i < tool->effects_wielded.size(); i++) { if (tool->effects_wielded[i] == effect) return true; } - for (int i = 0; i < tool->effects_carried.size(); i++) { + for (unsigned int i = 0; i < tool->effects_carried.size(); i++) { if (tool->effects_carried[i] == effect) return true; } @@ -3642,16 +3642,16 @@ bool player::has_artifact_with(art_effect_passive effect) for (int i = 0; i < inv.size(); i++) { if (inv[i].is_artifact() && inv[i].is_tool()) { it_artifact_tool *tool = dynamic_cast(inv[i].type); - for (int i = 0; i < tool->effects_carried.size(); i++) { + for (unsigned int i = 0; i < tool->effects_carried.size(); i++) { if (tool->effects_carried[i] == effect) return true; } } } - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (worn[i].is_artifact()) { it_artifact_armor *armor = dynamic_cast(worn[i].type); - for (int i = 0; i < armor->effects_worn.size(); i++) { + for (unsigned int i = 0; i < armor->effects_worn.size(); i++) { if (armor->effects_worn[i] == effect) return true; } @@ -3679,7 +3679,7 @@ int player::amount_of(itype_id it) int quantity = 0; if (weapon.type->id == it) quantity++; - for (int i = 0; i < weapon.contents.size(); i++) { + for (unsigned int i = 0; i < weapon.contents.size(); i++) { if (weapon.contents[i].type->id == it) quantity++; } @@ -3703,7 +3703,7 @@ int player::charges_of(itype_id it) int quantity = 0; if (weapon.type->id == it) quantity += weapon.charges; - for (int i = 0; i < weapon.contents.size(); i++) { + for (unsigned int i = 0; i < weapon.contents.size(); i++) { if (weapon.contents[i].type->id == it) quantity += weapon.contents[i].charges; } @@ -3756,7 +3756,7 @@ bool player::has_weapon_or_armor(char let) { if (weapon.invlet == let) return true; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (worn[i].invlet == let) return true; } @@ -3772,7 +3772,7 @@ bool player::has_item(item *it) { if (it == &weapon) return true; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (it == &(worn[i])) return true; } @@ -3785,15 +3785,15 @@ bool player::has_mission_item(int mission_id) return false; if (weapon.mission_id == mission_id) return true; - for (int i = 0; i < weapon.contents.size(); i++) { + for (unsigned int i = 0; i < weapon.contents.size(); i++) { if (weapon.contents[i].mission_id == mission_id) return true; } for (int i = 0; i < inv.size(); i++) { - for (int j = 0; j < inv.stack_at(i).size(); j++) { + for (unsigned int j = 0; j < inv.stack_at(i).size(); j++) { if (inv.stack_at(i)[j].mission_id == mission_id) return true; - for (int k = 0; k < inv.stack_at(i)[j].contents.size(); k++) { + for (unsigned int k = 0; k < inv.stack_at(i)[j].contents.size(); k++) { if (inv.stack_at(i)[j].contents[k].mission_id == mission_id) return true; } @@ -4164,7 +4164,7 @@ void player::pick_style(game *g) // Style selection menu { std::vector options; options.push_back("No style"); - for (int i = 0; i < styles.size(); i++) + for (unsigned int i = 0; i < styles.size(); i++) options.push_back( g->itypes[styles[i]]->name ); int selection = menu_vec("Select a style", options); if (selection >= 2) @@ -4218,7 +4218,7 @@ bool player::wear_item(game *g, item *to_wear) // Make sure we're not wearing 2 of the item already int count = 0; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (worn[i].type->id == to_wear->type->id) count++; } @@ -4271,7 +4271,7 @@ bool player::wear_item(game *g, item *to_wear) } // Checks to see if the player is wearing not cotton or not wool, ie leather/plastic shoes if (armor->covers & mfb(bp_feet) && wearing_something_on(bp_feet) && !(to_wear->made_of(WOOL) || to_wear->made_of(COTTON))) { - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { item *worn_item = &worn[i]; it_armor *worn_armor = dynamic_cast(worn_item->type); if( worn_armor->covers & mfb(bp_feet) && !(worn_item->made_of(WOOL) || worn_item->made_of(COTTON))) { @@ -4300,7 +4300,7 @@ bool player::wear_item(game *g, item *to_wear) bool player::takeoff(game *g, char let) { - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (worn[i].invlet == let) { if (volume_capacity() - (dynamic_cast(worn[i].type))->storage > volume_carried() + worn[i].type->volume) { @@ -4446,7 +4446,7 @@ press 'U' while wielding the unloaded gun.", gun->tname(g).c_str()); inv.add_item(copy); return; } - for (int i = 0; i < gun->contents.size(); i++) { + for (unsigned int i = 0; i < gun->contents.size(); i++) { if (gun->contents[i].type->id == used->type->id) { g->add_msg("Your %s already has a %s.", gun->tname(g).c_str(), used->tname(g).c_str()); @@ -4658,7 +4658,7 @@ bool player::can_sleep(game *g) int player::warmth(body_part bp) { int ret = 0; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if ((dynamic_cast(worn[i].type))->covers & mfb(bp)) ret += (dynamic_cast(worn[i].type))->warmth; } @@ -4674,7 +4674,7 @@ int player::encumb(body_part bp, int &layers, int &armorenc, int &warmth) { int ret = 0; it_armor* armor; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if (!worn[i].is_armor()) debugmsg("%s::encumb hit a non-armor item at worn[%d] (%s)", name.c_str(), i, worn[i].tname().c_str()); @@ -4725,7 +4725,7 @@ int player::armor_bash(body_part bp) { int ret = 0; it_armor* armor; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { armor = dynamic_cast(worn[i].type); if (armor->covers & mfb(bp)) ret += armor->dmg_resist; @@ -4754,7 +4754,7 @@ int player::armor_cut(body_part bp) { int ret = 0; it_armor* armor; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { armor = dynamic_cast(worn[i].type); if (armor->covers & mfb(bp)) ret += armor->cut_resist; @@ -4915,7 +4915,7 @@ void player::absorb(game *g, body_part bp, int &dam, int &cut) int player::resist(body_part bp) { int ret = 0; - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if ((dynamic_cast(worn[i].type))->covers & mfb(bp) || (bp == bp_eyes && // Head protection works on eyes too (e.g. baseball cap) (dynamic_cast(worn[i].type))->covers & mfb(bp_head))) @@ -4931,7 +4931,7 @@ int player::resist(body_part bp) bool player::wearing_something_on(body_part bp) { - for (int i = 0; i < worn.size(); i++) { + for (unsigned int i = 0; i < worn.size(); i++) { if ((dynamic_cast(worn[i].type))->covers & mfb(bp)) return true; } @@ -5005,7 +5005,7 @@ std::vector player::has_ammo(ammotype at) if (inv[a].is_ammo() && dynamic_cast(inv[a].type)->type == at) { newtype = true; tmp = dynamic_cast(inv[a].type); - for (int i = 0; i < ret.size(); i++) { + for (unsigned int i = 0; i < ret.size(); i++) { if (tmp->id == inv[ret[i]].type->id && inv[a].charges == inv[ret[i]].charges) { // They're effectively the same; don't add it to the list @@ -5037,7 +5037,7 @@ std::string player::weapname(bool charges) dump << weapon.tname().c_str() << " (" << weapon.charges; if( -1 != spare_mag ) dump << "+" << weapon.contents[spare_mag].charges; - for (int i = 0; i < weapon.contents.size(); i++) + for (unsigned int i = 0; i < weapon.contents.size(); i++) if (weapon.contents[i].is_gunmod() && weapon.contents[i].has_flag(IF_MODE_AUX)) dump << "+" << weapon.contents[i].charges; diff --git a/ranged.cpp b/ranged.cpp index 90326f8774313..e35b0dc67f6a6 100644 --- a/ranged.cpp +++ b/ranged.cpp @@ -197,7 +197,7 @@ void game::fire(player &p, int tarx, int tary, std::vector &trajectory, int x = p.posx - 1 + rng(0, 2); int y = p.posy - 1 + rng(0, 2); std::vector& items = m.i_at(x, y); - int i; + unsigned int i; for (i = 0; i < items.size(); i++) if (items[i].typeId() == casing_type && items[i].charges < (dynamic_cast(items[i].type))->count) { @@ -273,7 +273,7 @@ void game::fire(player &p, int tarx, int tary, std::vector &trajectory, } int dam = weapon->gun_damage(); - for (int i = 0; i < trajectory.size() && + for (unsigned int i = 0; i < trajectory.size() && (dam > 0 || (effects & AMMO_FLAME)); i++) { if (i > 0) m.drawsq(w_terrain, u, trajectory[i-1].x, trajectory[i-1].y, false, true); @@ -427,7 +427,7 @@ void game::throw_item(player &p, int tarx, int tary, item &thrown, dam = thrown.weight() * 3; int i = 0, tx = 0, ty = 0; - for (i = 0; i < trajectory.size() && dam > -10; i++) { + for (unsigned i = 0; i < trajectory.size() && dam > -10; i++) { message = ""; double goodhit = missed_by; tx = trajectory[i].x; @@ -450,7 +450,7 @@ void game::throw_item(player &p, int tarx, int tary, item &thrown, rng(0, thrown.volume() + 8) - rng(0, p.str_cur) < thrown.volume()) { if (u_see(tx, ty, tart)) add_msg("The %s shatters!", thrown.tname().c_str()); - for (int i = 0; i < thrown.contents.size(); i++) + for (unsigned int i = 0; i < thrown.contents.size(); i++) m.add_item(tx, ty, thrown.contents[i]); sound(tx, ty, 16, "glass breaking!"); int glassdam = rng(0, thrown.volume() * 2); @@ -509,7 +509,7 @@ void game::throw_item(player &p, int tarx, int tary, item &thrown, rng(0, thrown.volume() + 8) - rng(0, p.str_cur) < thrown.volume()) { if (u_see(tx, ty, tart)) add_msg("The %s shatters!", thrown.tname().c_str()); - for (int i = 0; i < thrown.contents.size(); i++) + for (unsigned int i = 0; i < thrown.contents.size(); i++) m.add_item(tx, ty, thrown.contents[i]); sound(tx, ty, 16, "glass breaking!"); } else { @@ -534,7 +534,7 @@ std::vector game::target(int &x, int &y, int lowx, int lowy, int hix, // If no previous target, target the closest there is double closest = -1; double dist; - for (int i = 0; i < t.size(); i++) { + for (unsigned int i = 0; i < t.size(); i++) { dist = rl_dist(t[i].posx, t[i].posy, u.posx, u.posy); if (closest < 0 || dist < closest) { closest = dist; @@ -586,13 +586,13 @@ std::vector game::target(int &x, int &y, int lowx, int lowy, int hix, lm.generate(this, center.x, center.y, natural_light_level(), u.active_light()); m.draw(this, w_terrain, center); // Draw the Monsters - for (int i = 0; i < z.size(); i++) { + for (unsigned int i = 0; i < z.size(); i++) { if (u_see(&(z[i]), tart) && z[i].posx >= lowx && z[i].posy >= lowy && z[i].posx <= hix && z[i].posy <= hiy) z[i].draw(w_terrain, center.x, center.y, false); } // Draw the NPCs - for (int i = 0; i < active_npc.size(); i++) { + for (unsigned int i = 0; i < active_npc.size(); i++) { if (u_see(active_npc[i].posx, active_npc[i].posy, tart)) active_npc[i].draw(w_terrain, center.x, center.y, false); } @@ -610,7 +610,7 @@ std::vector game::target(int &x, int &y, int lowx, int lowy, int hix, if (m.sees(u.posx, u.posy, x, y, -1, tart)) {// Selects a valid line-of-sight ret = line_to(u.posx, u.posy, x, y, tart); // Sets the vector to that LOS // Draw the trajectory - for (int i = 0; i < ret.size(); i++) { + for (unsigned int i = 0; i < ret.size(); i++) { if (abs(ret[i].x - u.posx) <= sight_dist && abs(ret[i].y - u.posy) <= sight_dist ) { int mondex = mon_at(ret[i].x, ret[i].y), @@ -679,7 +679,7 @@ std::vector game::target(int &x, int &y, int lowx, int lowy, int hix, x = t[target].posx; y = t[target].posy; } else if (ch == '.' || ch == 'f' || ch == 'F' || ch == '\n') { - for (int i = 0; i < t.size(); i++) { + for (unsigned int i = 0; i < t.size(); i++) { if (t[i].posx == x && t[i].posy == y) target = i; } @@ -1018,7 +1018,7 @@ void splatter(game *g, std::vector trajectory, int dam, monster* mon) std::vector spurt = continue_line(trajectory, distance); - for (int i = 0; i < spurt.size(); i++) { + for (unsigned int i = 0; i < spurt.size(); i++) { int tarx = spurt[i].x, tary = spurt[i].y; if (g->m.field_at(tarx, tary).type == blood && g->m.field_at(tarx, tary).density < 3) diff --git a/texthash.cpp b/texthash.cpp index 31db6e78073f7..6478052fdd6e4 100644 --- a/texthash.cpp +++ b/texthash.cpp @@ -3,7 +3,7 @@ bool text_hash::add(std::string key, std::string value) { - for (int i = 0; i < keys.size(); i++) { + for (unsigned int i = 0; i < keys.size(); i++) { if (keys[i] == key) return false; // Fail if key exists } @@ -14,7 +14,7 @@ bool text_hash::add(std::string key, std::string value) std::string text_hash::value(std::string key) { - for (int i = 0; i < keys.size(); i++) { + for (unsigned int i = 0; i < keys.size(); i++) { if (keys[i] == key) return values[i]; } diff --git a/tutorial.cpp b/tutorial.cpp index 036aa2b7695c4..27f191e97c944 100644 --- a/tutorial.cpp +++ b/tutorial.cpp @@ -75,7 +75,7 @@ void tutorial_game::per_turn(game *g) add_message(g, LESSON_RECOIL); if (!tutorials_seen[LESSON_BUTCHER]) { - for (int i = 0; i < g->m.i_at(g->u.posx, g->u.posy).size(); i++) { + for (unsigned int i = 0; i < g->m.i_at(g->u.posx, g->u.posy).size(); i++) { if (g->m.i_at(g->u.posx, g->u.posy)[i].type->id == itm_corpse) { add_message(g, LESSON_BUTCHER); i = g->m.i_at(g->u.posx, g->u.posy).size(); diff --git a/veh_interact.cpp b/veh_interact.cpp index 219107edf229a..b544ed6c90c6f 100644 --- a/veh_interact.cpp +++ b/veh_interact.cpp @@ -85,7 +85,7 @@ void veh_interact::exec (game *gm, vehicle *v, int x, int y) bool finish = false; while (!finish) { - char ch = input(); // See keypress.h + char ch = char(input()); // See keypress.h int dx, dy; get_direction (gm, dx, dy, ch); if (ch == KEY_ESCAPE) @@ -178,7 +178,7 @@ void veh_interact::do_install(int reason) int pos = 0; int engines = 0; int dif_eng = 0; - for (int p = 0; p < veh->parts.size(); p++) + for (unsigned int p = 0; p < veh->parts.size(); p++) if (veh->part_flag (p, vpf_engine)) { engines++; @@ -415,7 +415,7 @@ int veh_interact::part_at (int dx, int dy) { int vdx = -ddx - dy; int vdy = dx - ddy; - for (int ep = 0; ep < veh->external_parts.size(); ep++) + for (unsigned int ep = 0; ep < veh->external_parts.size(); ep++) { int p = veh->external_parts[ep]; if (veh->parts[p].mount_dx == vdx && veh->parts[p].mount_dy == vdy) @@ -463,7 +463,7 @@ void veh_interact::move_cursor (int dx, int dy) { parts_here = veh->internal_parts(cpart); parts_here.insert (parts_here.begin(), cpart); - for (int i = 0; i < parts_here.size(); i++) + for (unsigned int i = 0; i < parts_here.size(); i++) { int p = parts_here[i]; if (veh->parts[p].hp < veh->part_info(p).durability) @@ -481,7 +481,7 @@ void veh_interact::move_cursor (int dx, int dy) void veh_interact::display_veh () { int x1 = 12, y1 = 12, x2 = -12, y2 = -12; - for (int ep = 0; ep < veh->external_parts.size(); ep++) + for (unsigned int ep = 0; ep < veh->external_parts.size(); ep++) { int p = veh->external_parts[ep]; if (veh->parts[p].mount_dx < x1) @@ -508,7 +508,7 @@ void veh_interact::display_veh () if (y2 > 5) ddy = 5 - y2; - for (int ep = 0; ep < veh->external_parts.size(); ep++) + for (unsigned int ep = 0; ep < veh->external_parts.size(); ep++) { int p = veh->external_parts[ep]; char sym = veh->part_sym (p); @@ -642,7 +642,7 @@ item consume_vpart_item (game *g, vpart_id vpid){ const itype_id itid = vpart_list[vpid].item; for (int x = g->u.posx - PICKUP_RANGE; x <= g->u.posx + PICKUP_RANGE; x++) for (int y = g->u.posy - PICKUP_RANGE; y <= g->u.posy + PICKUP_RANGE; y++) - for(int i=0; i < g->m.i_at(x,y).size(); i++){ + for(unsigned int i=0; i < g->m.i_at(x,y).size(); i++){ item* ith_item = &(g->m.i_at(x,y)[i]); if (ith_item->type->id == itid) candidates.push_back (candidate_vpart(x,y,i,*ith_item)); @@ -670,7 +670,7 @@ item consume_vpart_item (game *g, vpart_id vpid){ } else { // popup menu!? std::vector options; - for(int i=0;ipl_refill_vehicle(*veh, part); break; case 'o': - for (int i = 0; i < veh->parts[part].items.size(); i++) + for (unsigned int i = 0; i < veh->parts[part].items.size(); i++) g->m.add_item (g->u.posx, g->u.posy, veh->parts[part].items[i]); veh->parts[part].items.clear(); itm = veh->part_info(part).item; diff --git a/vehicle.cpp b/vehicle.cpp index 508b7e6c05083..8b24643c9c7c8 100644 --- a/vehicle.cpp +++ b/vehicle.cpp @@ -140,7 +140,7 @@ void vehicle::save (std::ofstream &stout) parts.size() << std::endl; stout << name << std::endl; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) { stout << parts[p].id << " " << @@ -151,11 +151,11 @@ void vehicle::save (std::ofstream &stout) parts[p].blood << " " << parts[p].bigness<< " " << parts[p].items.size() << std::endl; - for (int i = 0; i < parts[p].items.size(); i++) + for (unsigned int i = 0; i < parts[p].items.size(); i++) { stout << parts[p].items[i].save_info() << std::endl; // item info stout << parts[p].items[i].contents.size() << std::endl; // how many items inside this item - for (int l = 0; l < parts[p].items[i].contents.size(); l++) + for (unsigned int l = 0; l < parts[p].items[i].contents.size(); l++) stout << parts[p].items[i].contents[l].save_info() << std::endl; // contents info } } @@ -165,7 +165,7 @@ void vehicle::init_state(game* g) { int consistent_bignesses[num_vparts]; memset (consistent_bignesses, 0, sizeof(consistent_bignesses)); - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) { if (part_flag(p, vpf_variable_size)){ // generate its bigness attribute.? if(!consistent_bignesses[parts[p].id]){ @@ -207,7 +207,7 @@ std::string vehicle::use_controls() bool has_lights = false; bool has_turrets = false; - for (int p = 0; p < parts.size(); p++) { + for (unsigned int p = 0; p < parts.size(); p++) { if (part_flag(p, vpf_light)) has_lights = true; else if (part_flag(p, vpf_turret)) @@ -353,7 +353,7 @@ bool vehicle::can_unmount (int p) if (!dx && !dy) { // central point bool is_ext = false; - for (int ep = 0; ep < external_parts.size(); ep++) + for (unsigned int ep = 0; ep < external_parts.size(); ep++) if (external_parts[ep] == p) { is_ext = true; @@ -459,7 +459,7 @@ void vehicle::remove_part (int p) std::vector vehicle::parts_at_relative (int dx, int dy) { std::vector res; - for (int i = 0; i < parts.size(); i++) + for (unsigned int i = 0; i < parts.size(); i++) if (parts[i].mount_dx == dx && parts[i].mount_dy == dy) res.push_back (i); return res; @@ -468,7 +468,7 @@ std::vector vehicle::parts_at_relative (int dx, int dy) std::vector vehicle::internal_parts (int p) { std::vector res; - for (int i = p + 1; i < parts.size(); i++) + for (unsigned int i = p + 1; i < parts.size(); i++) if (parts[i].mount_dx == parts[p].mount_dx && parts[i].mount_dy == parts[p].mount_dy) res.push_back (i); return res; @@ -479,7 +479,7 @@ int vehicle::part_with_feature (int p, unsigned int f, bool unbroken) if (part_flag(p, f)) return p; std::vector parts_here = internal_parts (p); - for (int i = 0; i < parts_here.size(); i++) + for (unsigned int i = 0; i < parts_here.size(); i++) if (part_flag(parts_here[i], f) && (!unbroken || parts[parts_here[i]].hp > 0)) return parts_here[i]; return -1; @@ -494,7 +494,7 @@ bool vehicle::part_flag (int p, unsigned int f) int vehicle::part_at(int dx, int dy) { - for (int i = 0; i < external_parts.size(); i++) + for (unsigned int i = 0; i < external_parts.size(); i++) { int p = external_parts[i]; if (parts[p].precalc_dx[0] == dx && @@ -557,7 +557,7 @@ void vehicle::print_part_desc (void *w, int y1, int width, int p, int hl) std::vector pl = internal_parts (p); pl.insert (pl.begin(), p); int y = y1; - for (int i = 0; i < pl.size(); i++) + for (unsigned int i = 0; i < pl.size(); i++) { int dur = part_info (pl[i]).durability; int per_cond = parts[pl[i]].hp * 100 / (dur < 1? 1 : dur); @@ -642,7 +642,7 @@ void vehicle::precalc_mounts (int idir, int dir) { if (idir < 0 || idir > 1) idir = 0; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) { int dx, dy; coord_translate (dir, parts[p].mount_dx, parts[p].mount_dy, dx, dy); @@ -654,7 +654,7 @@ void vehicle::precalc_mounts (int idir, int dir) std::vector vehicle::boarded_parts() { std::vector res; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag (p, vpf_seat) && parts[p].has_flag(vehicle_part::passenger_flag)) res.push_back (p); @@ -689,7 +689,7 @@ int vehicle::global_y () int vehicle::total_mass () { int m = 0; - for (int i = 0; i < parts.size(); i++) + for (unsigned int i = 0; i < parts.size(); i++) { m += g->itypes[part_info(i).item]->weight; for (int j = 0; j < parts[i].items.size(); j++) @@ -703,7 +703,7 @@ int vehicle::total_mass () int vehicle::fuel_left (int ftype, bool for_engine) { int fl = 0; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag(p, vpf_fuel_tank) && (ftype == part_info(p).fuel_type || (for_engine && ftype == AT_BATT && part_info(p).fuel_type == AT_PLUT))) @@ -714,7 +714,7 @@ int vehicle::fuel_left (int ftype, bool for_engine) int vehicle::fuel_capacity (int ftype) { int cap = 0; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag(p, vpf_fuel_tank) && ftype == part_info(p).fuel_type) cap += part_info(p).size; return cap; @@ -722,7 +722,7 @@ int vehicle::fuel_capacity (int ftype) int vehicle::refill (int ftype, int amount) { - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) { if (part_flag(p, vpf_fuel_tank) && part_info(p).fuel_type == ftype && @@ -767,7 +767,7 @@ int vehicle::basic_consumption (int ftype) ftype = AT_BATT; int cnt = 0; int fcon = 0; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag(p, vpf_engine) && ftype == part_info(p).fuel_type && parts[p].hp > 0) @@ -784,7 +784,7 @@ int vehicle::total_power (bool fueled) { int pwr = 0; int cnt = 0; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag(p, vpf_engine) && (fuel_left (part_info(p).fuel_type, true) || !fueled || part_info(p).fuel_type == AT_MUSCLE) && @@ -801,7 +801,7 @@ int vehicle::total_power (bool fueled) int vehicle::solar_power () { int pwr = 0; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag(p, vpf_solar_panel) && parts[p].hp > 0) pwr += part_power(p); return pwr; @@ -821,7 +821,7 @@ int vehicle::safe_velocity (bool fueled) { int pwrs = 0; int cnt = 0; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag(p, vpf_engine) && (fuel_left (part_info(p).fuel_type, true) || !fueled || part_info(p).fuel_type == AT_MUSCLE) && @@ -848,11 +848,11 @@ int vehicle::noise (bool fueled, bool gas_only) int pwrs = 0; int cnt = 0; int muffle = 100; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag(p, vpf_muffler) && parts[p].hp > 0 && part_info(p).bonus < muffle) muffle = part_info(p).bonus; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag(p, vpf_engine) && (fuel_left (part_info(p).fuel_type, true) || !fueled || part_info(p).fuel_type == AT_MUSCLE) && @@ -883,7 +883,7 @@ float vehicle::wheels_area (int *cnt) { int count = 0; int total_area = 0; - for (int i = 0; i < external_parts.size(); i++) + for (unsigned int i = 0; i < external_parts.size(); i++) { int p = external_parts[i]; if (part_flag(p, vpf_wheel) && @@ -907,7 +907,7 @@ float vehicle::k_dynamics () int obst[max_obst]; for (int o = 0; o < max_obst; o++) obst[o] = 0; - for (int i = 0; i < external_parts.size(); i++) + for (unsigned int i = 0; i < external_parts.size(); i++) { int p = external_parts[i]; int frame_size = part_flag(p, vpf_obstacle)? 30 : 10; @@ -965,7 +965,7 @@ bool vehicle::valid_wheel_config () { int x1 = 0, y1 = 0, x2 = 0, y2 = 0; int count = 0; - for (int i = 0; i < external_parts.size(); i++) + for (unsigned int i = 0; i < external_parts.size(); i++) { int p = external_parts[i]; if (!part_flag(p, vpf_wheel) || @@ -990,7 +990,7 @@ bool vehicle::valid_wheel_config () return false; float xo = 0, yo = 0; float wo = 0, w2; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) { // lets find vehicle's center of masses w2 = g->itypes[part_info(p).item]->weight; if (w2 < 1) @@ -1019,7 +1019,7 @@ void vehicle::consume_fuel () bool found = false; for (int j = 0; j < (elec? 2 : 1); j++) { - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) // if this is a fuel tank // and its type is same we're looking for now // and for electric engines: @@ -1089,7 +1089,7 @@ void vehicle::thrust (int thd) int strn = (int) (strain () * strain() * 100); - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag(p, vpf_engine) && (fuel_left (part_info(p).fuel_type, true)) && parts[p].hp > 0 && rng (1, 100) < strn) @@ -1585,7 +1585,7 @@ void vehicle::gain_moves (int /*mp*/) } } // check for smoking parts - for (int ep = 0; ep < external_parts.size(); ep++) + for (unsigned int ep = 0; ep < external_parts.size(); ep++) { int p = external_parts[ep]; if (parts[p].blood > 0) @@ -1603,7 +1603,7 @@ void vehicle::gain_moves (int /*mp*/) } if (turret_mode) // handle turrets - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) fire_turret (p); } @@ -1613,7 +1613,7 @@ void vehicle::find_external_parts () for (int p = 0; p < parts.size(); p++) { bool ex = false; - for (int i = 0; i < external_parts.size(); i++) + for (unsigned int i = 0; i < external_parts.size(); i++) if (parts[external_parts[i]].mount_dx == parts[p].mount_dx && parts[external_parts[i]].mount_dy == parts[p].mount_dy) { @@ -1628,7 +1628,7 @@ void vehicle::find_external_parts () void vehicle::find_exhaust () { int en = -1; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (part_flag(p, vpf_engine) && part_info(p).fuel_type == AT_GAS) { en = p; @@ -1642,7 +1642,7 @@ void vehicle::find_exhaust () } exhaust_dy = parts[en].mount_dy; exhaust_dx = parts[en].mount_dx; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (parts[p].mount_dy == exhaust_dy && parts[p].mount_dx < exhaust_dx) exhaust_dx = parts[p].mount_dx; @@ -1652,7 +1652,7 @@ void vehicle::find_exhaust () void vehicle::refresh_insides () { insides_dirty = false; - for (int ep = 0; ep < external_parts.size(); ep++) + for (unsigned int ep = 0; ep < external_parts.size(); ep++) { int p = external_parts[ep]; if (part_with_feature(p, vpf_roof) < 0 || parts[p].hp <= 0) @@ -1670,7 +1670,7 @@ void vehicle::refresh_insides () int ndy = i < 2? 0 : (i == 2? - 1: 1); std::vector parts_n3ar = parts_at_relative (parts[p].mount_dx + ndx, parts[p].mount_dy + ndy); bool cover = false; // if we aren't covered from sides, the roof at p won't save us - for (int j = 0; j < parts_n3ar.size(); j++) + for (unsigned int j = 0; j < parts_n3ar.size(); j++) { int pn = parts_n3ar[j]; if (parts[pn].hp <= 0) @@ -1713,7 +1713,7 @@ bool vehicle::is_inside (int p) void vehicle::unboard_all () { std::vector bp = boarded_parts (); - for (int i = 0; i < bp.size(); i++) + for (unsigned int i = 0; i < bp.size(); i++) g->m.unboard_vehicle (g, global_x() + parts[bp[i]].precalc_dx[0], global_y() + parts[bp[i]].precalc_dy[0]); } @@ -1727,7 +1727,7 @@ int vehicle::damage (int p, int dmg, int type, bool aimed) if (!aimed) { bool found_obs = false; - for (int i = 0; i < pl.size(); i++) + for (unsigned int i = 0; i < pl.size(); i++) if (part_flag (pl[i], vpf_obstacle) && (!part_flag (pl[i], vpf_openable) || !parts[pl[i]].open)) { @@ -1763,7 +1763,7 @@ void vehicle::damage_all (int dmg1, int dmg2, int type) } if (dmg1 < 1) return; - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) if (!one_in(4)) damage_direct (p, rng (dmg1, dmg2), type); } @@ -1867,7 +1867,7 @@ void vehicle::fire_turret (int p, bool burst) { // consume fuel if (amt == AT_PLASMA) charges *= 10; // hacky, too - for (int p = 0; p < parts.size(); p++) + for (unsigned int p = 0; p < parts.size(); p++) { if (part_flag(p, vpf_fuel_tank) && part_info(p).fuel_type == amt && @@ -1910,7 +1910,7 @@ bool vehicle::fire_turret_internal (int p, it_gun &gun, it_ammo &ammo, int charg monster *target = 0; int range = ammo.type == AT_GAS? 5 : 12; int closest = range + 1; - for (int i = 0; i < g->z.size(); i++) + for (unsigned int i = 0; i < g->z.size(); i++) { int dist = rl_dist(x, y, g->z[i].posx, g->z[i].posy); if (g->z[i].friendly == 0 && dist < closest && @@ -1925,7 +1925,7 @@ bool vehicle::fire_turret_internal (int p, it_gun &gun, it_ammo &ammo, int charg return false; std::vector traj = line_to(x, y, target->posx, target->posy, fire_t); - for (int i = 0; i < traj.size(); i++) + for (unsigned int i = 0; i < traj.size(); i++) if (traj[i].x == g->u.posx && traj[i].y == g->u.posy) return false; // won't shoot at player if (g->u_see(x, y, t)) @@ -1947,7 +1947,7 @@ bool vehicle::fire_turret_internal (int p, it_gun &gun, it_ammo &ammo, int charg g->fire(tmp, target->posx, target->posy, traj, true); if (ammo.type == AT_GAS) { - for (int i = 0; i < traj.size(); i++) + for (unsigned int i = 0; i < traj.size(); i++) g->m.add_field(g, traj[i].x, traj[i].y, fd_fire, 1); } diff --git a/weather.cpp b/weather.cpp index 68703117f554c..5027bde331922 100644 --- a/weather.cpp +++ b/weather.cpp @@ -118,7 +118,7 @@ void weather_effect::acid(game *g) } } } - for (int i = 0; i < g->z.size(); i++) { + for (unsigned int i = 0; i < g->z.size(); i++) { if (g->m.is_outside(g->z[i].posx, g->z[i].posy)) { if (!g->z[i].has_flag(MF_ACIDPROOF)) g->z[i].hurt(1); diff --git a/wish.cpp b/wish.cpp index bc2be06abd2c2..27a5bf35ed42e 100644 --- a/wish.cpp +++ b/wish.cpp @@ -9,7 +9,8 @@ void game::wish() { WINDOW* w_list = newwin(25, 30, 0, 0); WINDOW* w_info = newwin(25, 50, 0, 30); - int a = 0, shift = 0, result_selected = 0; + int a = 0; + unsigned int shift = 0, result_selected = 0; int ch = '.'; bool search = false, found = false; std::string pattern; @@ -221,7 +222,7 @@ void game::monster_wish() } if (search) { - for (int i = 1; i < mtypes.size(); i++) { + for (unsigned int i = 1; i < mtypes.size(); i++) { if (mtypes[i]->name.find(pattern) != std::string::npos) { shift = i; a = 0; @@ -440,22 +441,22 @@ void game::mutation_wish() mvwprintw(w_info, 1, 0, mutation_data[a+shift].valid ? "Valid" : "Nonvalid"); int line2 = 2; mvwprintw(w_info, line2, 0, "Prereqs:"); - for (int j = 0; j < mutation_data[a+shift].prereqs.size(); j++) { + for (unsigned int j = 0; j < mutation_data[a+shift].prereqs.size(); j++) { mvwprintw(w_info, line2, 9, traits[ mutation_data[a+shift].prereqs[j] ].name.c_str()); line2++; } mvwprintw(w_info, line2, 0, "Cancels:"); - for (int j = 0; j < mutation_data[a+shift].cancels.size(); j++) { + for (unsigned int j = 0; j < mutation_data[a+shift].cancels.size(); j++) { mvwprintw(w_info, line2, 9, traits[ mutation_data[a+shift].cancels[j] ].name.c_str()); line2++; } mvwprintw(w_info, line2, 0, "Becomes:"); - for (int j = 0; j < mutation_data[a+shift].replacements.size(); j++) { + for (unsigned int j = 0; j < mutation_data[a+shift].replacements.size(); j++) { mvwprintw(w_info, line2, 9, traits[ mutation_data[a+shift].replacements[j] ].name.c_str()); line2++; } mvwprintw(w_info, line2, 0, "Add-ons:"); - for (int j = 0; j < mutation_data[a+shift].additions.size(); j++) { + for (unsigned int j = 0; j < mutation_data[a+shift].additions.size(); j++) { mvwprintw(w_info, line2, 9, traits[ mutation_data[a+shift].additions[j] ].name.c_str()); line2++; }