--- deliantra/server/common/item.C 2009/11/05 15:43:21 1.62 +++ deliantra/server/common/item.C 2009/11/08 20:55:39 1.66 @@ -67,12 +67,6 @@ /*{"body_dragon_torso", "your body", "a dragon's body"} */ }; -static char numbers[21][20] = { - "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", - "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen", - "eighteen", "nineteen", "twenty" -}; - static char numbers_10[10][20] = { "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", "eighty", "ninety" @@ -209,7 +203,7 @@ {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, }; -const int item_types_size = sizeof (item_types) / sizeof (*item_types); +static const int item_types_size = sizeof (item_types) / sizeof (*item_types); materialtype_t *materialt; @@ -321,14 +315,12 @@ /* Do spell paths now */ for (i = 1; i < NRSPELLPATHS; i++) - { - if (op->path_attuned & (1 << i)) - enc++; - else if (op->path_denied & (1 << i)) - enc -= 2; - else if (op->path_repelled & (1 << i)) - enc--; - } + if (op->path_attuned & (1 << i)) + enc++; + else if (op->path_denied & (1 << i)) + enc -= 2; + else if (op->path_repelled & (1 << i)) + enc--; if (op->flag [FLAG_LIFESAVE ]) enc += 5; if (op->flag [FLAG_REFL_SPELL ]) enc += 3; @@ -443,26 +435,6 @@ } /* - * get_number(integer) returns the text-representation of the given number - * in a static buffer. The buffer might be overwritten at the next - * call to get_number(). - * It is currently only used by the query_name() function. - */ -const char * -get_number (int i) -{ - if (i <= 20) - return numbers[i]; - else - { - static char buf[MAX_BUF]; - - sprintf (buf, "%d", i); - return buf; - } -} - -/* * Returns pointer to static buffer containing ring's or amulet's * abilities * These are taken from old query_name(), but it would work better @@ -475,7 +447,7 @@ /* Aug 95 modified this slightly so that Skill tools don't have magic bonus * from stats.sp - b.t. */ -const char * +static const char * ring_desc (const object *op) { static dynbuf_text buf; buf.clear (); @@ -816,7 +788,7 @@ * fall into the 'lightning fast movement' category. */ if (op->has_active_speed ()) - switch ((int) ((FABS (op->speed)) * 15)) + switch ((int)((fabs (op->speed)) * 15.)) { case 0: buf << "(very slow movement)";