Merge pull request #1 from creidieki/combined

Grab some long-outstanding bugfixes.

Author: kevingranade

facdata.h

@@ -2,7 +2,7 @@
 
 std::string faction_adj_pos[15] = {
 "Shining", "Sacred", "Golden", "Holy", "Righteous", "Devoted", "Virtuous",
-"Splendid", "Divine", "Radiant", "Noble", "Venerable", "Immaculate"
+"Splendid", "Divine", "Radiant", "Noble", "Venerable", "Immaculate",
 "Heroic", "Bright"};
 
 std::string faction_adj_neu[15] = {

game.cpp

@@ -398,7 +398,7 @@ [email protected].");
     mvwprintz(w_open, 6, 12, c_red, "No templates found!");
    else {
     int tempstart = (sel1 < 6 ?  0 : sel1 - 6),
-        tempend   = (sel1 < 6 ? 14 : sel1 + 6);
+        tempend   = (sel1 < 6 ? 14 : sel1 + 8);
     for (int i = tempstart; i < tempend; i++) {
      int line = 6 + i - tempstart;
      mvwprintz(w_open, line, 29, c_black, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
@@ -420,16 +420,16 @@ [email protected].");
      sel1++;
     else
      sel1 = 0;
-   } else if (ch == 'h' || ch == '<' || ch == KEY_ESCAPE) {
+   } else if (ch == 'h' || ch == '<' || ch == KEY_ESCAPE || templates.size() == 0) {
     sel1 = 1;
     layer = 2;
-    for (int i = 0; i < templates.size() && i < 21; i++)
+    for (int i = 0; i+6 < 21; i++)
      mvwprintz(w_open, 6 + i, 12, c_black, "                                 ");
     for (int i = 22; i < 25; i++)
      mvwprintw(w_open, i, 0, "                                                 \
                                 ");
    }
-   if (ch == 'l' || ch == '\n' || ch == '>') {
+   else if (ch == 'l' || ch == '\n' || ch == '>') {
     if (!u.create(this, PLTYPE_TEMPLATE, templates[sel1])) {
      u = player();
      delwin(w_open);

setvector.cpp

@@ -62,7 +62,7 @@ void setvector(std::vector<std::string> &vec, ... )
  va_list ap;
  va_start(ap, vec);
  char *tmp;
- while (tmp = (char *)va_arg(ap, int))
+ while (tmp = va_arg(ap, char *))
   vec.push_back((std::string)(tmp));
  va_end(ap);
 }
@@ -126,7 +126,7 @@ void setvector(std::vector<style_move> &vec, ... )
  technique_id tmptech;
  int tmplevel;
 
- while (tmpname = (char *)va_arg(ap, int)) {
+ while (tmpname = va_arg(ap, char *)) {
   tmptech = (technique_id)va_arg(ap, int);
   tmplevel = (int)va_arg(ap, int);
   vec.push_back( style_move(tmpname, tmptech, tmplevel) );

skill.cpp

@@ -252,6 +252,6 @@ double price_adjustment(int barter_skill)
   case 4:  return 0.8;
   case 5:  return 0.6;
   case 6:  return 0.5;
-  default: return double(int(100 * (.3 + 1 / barter_skill)) / 100);
+  default: return 0.3 + 1.0 / barter_skill;
  }
 }