ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/utils.C
(Generate patch)

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.60 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.66 by root, Sun Sep 9 06:56:10 2007 UTC

… …
36#include <funcpoint.h> 36#include <funcpoint.h>
37#include <material.h> 37#include <material.h>
38 38
39#include <glib.h> 39#include <glib.h>
40 40
41refcnt_base::refcnt_t refcnt_dummy;
42
41rand_gen rndm; 43rand_gen rndm;
42 44
43void 45void
44tausworthe_random_generator::seed (uint32_t seed) 46tausworthe_random_generator::seed (uint32_t seed)
45{ 47{
… …
212{ 214{
213 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next) 215 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next)
214 if (name == mt->name) 216 if (name == mt->name)
215 return mt; 217 return mt;
216 218
217 return materialt; 219 return 0;
218} 220}
219 221
220/* when doing transmutation of objects, we have to recheck the resistances, 222/* when doing transmutation of objects, we have to recheck the resistances,
221 * as some that did not apply previously, may apply now. 223 * as some that did not apply previously, may apply now.
222 */ 224 */
223
224void 225void
225transmute_materialname (object *op, const object *change) 226transmute_materialname (object *op, const object *change)
226{ 227{
227 materialtype_t *mt; 228 materialtype_t *mt;
228 int j; 229 int j;
… …
258void 259void
259set_materialname (object *op, int difficulty, materialtype_t *nmt) 260set_materialname (object *op, int difficulty, materialtype_t *nmt)
260{ 261{
261 materialtype_t *mt, *lmt; 262 materialtype_t *mt, *lmt;
262 263
263#ifdef NEW_MATERIAL_CODE
264 int j;
265#endif
266
267 if (op->materialname != NULL) 264 if (op->materialname != NULL)
268 return; 265 return;
269 266
270
271
272 if (nmt == NULL) 267 if (nmt == NULL)
273 { 268 {
274 lmt = NULL; 269 lmt = NULL;
275#ifndef NEW_MATERIAL_CODE 270
276 for (mt = materialt; mt && mt->next; mt = mt->next) 271 for (mt = materialt; mt && mt->next; mt = mt->next)
277 { 272 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
278 if (op->materials & mt->material) 273 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
279 { 274 {
280 lmt = mt; 275 lmt = mt;
276 if (!(op->is_weapon () || op->is_armor ()))
281 break; 277 break;
282 } 278 }
283 }
284
285#else
286 for (mt = materialt; mt && mt->next; mt = mt->next)
287 {
288 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
289 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
290 {
291 lmt = mt;
292 if (!(op->is_weapon () || op->is_armor ()))
293 break;
294 }
295 }
296#endif
297 } 279 }
298 else 280 else
299 {
300 lmt = nmt; 281 lmt = nmt;
301 }
302 282
303 if (lmt != NULL) 283 if (lmt != NULL)
304 { 284 {
305#ifndef NEW_MATERIAL_CODE
306 op->materialname = lmt->name;
307 return;
308#else
309
310 if (op->stats.dam && op->is_weapon ()) 285 if (op->stats.dam && op->is_weapon ())
311 { 286 {
312 op->stats.dam += lmt->damage; 287 op->stats.dam += lmt->damage;
313 if (op->stats.dam < 1) 288 if (op->stats.dam < 1)
314 op->stats.dam = 1; 289 op->stats.dam = 1;
… …
320 op->stats.wc += lmt->wc; 295 op->stats.wc += lmt->wc;
321 if (op->is_armor ()) 296 if (op->is_armor ())
322 { 297 {
323 if (op->stats.ac) 298 if (op->stats.ac)
324 op->stats.ac += lmt->ac; 299 op->stats.ac += lmt->ac;
300
325 for (j = 0; j < NROFATTACKS; j++) 301 for (int j = 0; j < NROFATTACKS; j++)
326 if (op->resist[j] != 0) 302 if (op->resist[j] != 0)
327 { 303 {
328 op->resist[j] += lmt->mod[j]; 304 op->resist[j] += lmt->mod[j];
329 if (op->resist[j] > 100) 305 if (op->resist[j] > 100)
330 op->resist[j] = 100; 306 op->resist[j] = 100;
331 if (op->resist[j] < -100) 307 if (op->resist[j] < -100)
332 op->resist[j] = -100; 308 op->resist[j] = -100;
333 } 309 }
334 } 310 }
311
335 op->materialname = lmt->name; 312 op->materialname = lmt->name;
336 /* dont make it unstackable if it doesn't need to be */ 313 /* dont make it unstackable if it doesn't need to be */
337 if (op->is_weapon () || op->is_armor ()) 314 if (op->is_weapon () || op->is_armor ())
338 { 315 {
339 op->weight = (op->weight * lmt->weight) / 100; 316 op->weight = (op->weight * lmt->weight) / 100;
340 op->value = (op->value * lmt->value) / 100; 317 op->value = (op->value * lmt->value) / 100;
341 } 318 }
342#endif
343 } 319 }
344} 320}
345 321
346/* 322/*
347 * Strip out the media tags from a String. 323 * Strip out the media tags from a String.
… …
442 * a 'list' for the purposes here, is a string of items, seperated by commas, except 418 * a 'list' for the purposes here, is a string of items, seperated by commas, except
443 * for the last entry, which has an 'and' before it, and a full stop (period) after it. 419 * for the last entry, which has an 'and' before it, and a full stop (period) after it.
444 * This function will also strip all trailing non alphanumeric characters. 420 * This function will also strip all trailing non alphanumeric characters.
445 * It does not insert an oxford comma. 421 * It does not insert an oxford comma.
446 */ 422 */
447
448void 423void
449make_list_like (char *input) 424make_list_like (char *input)
450{ 425{
451 char *p, tmp[MAX_BUF]; 426 char *p, tmp[MAX_BUF];
452 int i; 427 int i;
… …
542 } 517 }
543 else 518 else
544 memcpy (dst, src, len + 1); 519 memcpy (dst, src, len + 1);
545} 520}
546 521
547const std::string 522const char *
548format (const char *format, ...) 523format (const char *format, ...)
549{ 524{
550 int len; 525 static dynbuf_text buf;
551 526
552 { 527 buf.clear ();
553 char buf[128];
554 528
555 va_list ap; 529 va_list ap;
556 va_start (ap, format); 530 va_start (ap, format);
557 len = vsnprintf (buf, sizeof (buf), format, ap); 531 buf.vprintf (format, ap);
558 va_end (ap); 532 va_end (ap);
559 533
560 assert (len >= 0); // shield againstz broken vsnprintf's
561
562 // was our static buffer short enough?
563 if (len < sizeof (buf))
564 return std::string (buf, len);
565 }
566
567 {
568 // longer, try harder
569 char *buf = salloc<char> (len + 1);
570
571 va_list ap;
572 va_start (ap, format);
573 vsnprintf (buf, len + 1, format, ap);
574 va_end (ap);
575
576 const std::string s (buf, len);
577 sfree<char> (buf, len + 1);
578
579 return buf; 534 return buf;
580 }
581} 535}
582 536
583tstamp now () 537tstamp now ()
584{ 538{
585 struct timeval tv; 539 struct timeval tv;
… …
653 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 607 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
654 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 608 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
655 0x2d02ef8dL 609 0x2d02ef8dL
656}; 610};
657 611
658

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines