Merge branch 'master' into LiveView

CataclysmWin.cbp

@@ -188,7 +188,6 @@
 		<Unit filename="animation_tiles.cpp" />
 		<Unit filename="artifact.cpp" />
 		<Unit filename="artifact.h" />
-		<Unit filename="artifactdata.h" />
 		<Unit filename="auto_pickup.cpp" />
 		<Unit filename="auto_pickup.h" />
 		<Unit filename="basecamp.cpp" />

animation_curses.cpp

@@ -58,6 +58,7 @@ void game::draw_hit_mon(int x, int y, monster m, bool dead)
 /* Player hit animation */
 void game::draw_hit_player(player *p, bool dead)
 {
+    (void)dead; //unused
     hit_animation(POSX + (p->posx - (u.posx + u.view_offset_x)),
                   POSY + (p->posy - (u.posy + u.view_offset_y)),
                   red_background(p->color()), '@');
@@ -91,6 +92,8 @@ void game::draw_line(const int x, const int y, const point center_point, std::ve
 }
 void game::draw_line(const int x, const int y, std::vector<point> vPoint)
 {
+    (void)x; //unused
+    (void)y; //unused
     for (int i = 1; i < vPoint.size(); i++)
     {
         m.drawsq(w_terrain, u, vPoint[i-1].x, vPoint[i-1].y, true, true);

animation_tiles.cpp

@@ -41,6 +41,8 @@ void game::draw_explosion(int x, int y, int radius, nc_color col)
 // need to have a version where there is no player defined, possibly. That way shrapnel works as intended
 void game::draw_bullet(player &p, int tx, int ty, int i, std::vector<point> trajectory, char bullet_char, timespec &ts)
 {
+    (void)i; //unused
+    (void)trajectory; //unused
     if (u_see(tx, ty)) {
         std::string bullet;// = "animation_bullet_normal";
         switch(bullet_char)
@@ -94,6 +96,7 @@ void game::draw_hit_mon(int x, int y, monster m, bool dead)
 /* Player hit animation */
 void game::draw_hit_player(player *p, bool dead)
 {
+    (void)dead; //unused
     if (use_tiles)
     {
         // get base name of player id