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

Comparing deliantra/server/random_maps/standalone.C (file contents):
Revision 1.11 by root, Sat Dec 30 18:45:28 2006 UTC vs.
Revision 1.12 by root, Sun Dec 31 19:02:24 2006 UTC

1
1/* 2/*
2 CrossFire, A Multiplayer game for X-windows 3 CrossFire, A Multiplayer game for X-windows
3 4
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
88 object *tmp = NULL; 89 object *tmp = NULL;
89 int i; 90 int i;
90 91
91 switch (op->type) 92 switch (op->type)
92 { 93 {
93 case SHOP_FLOOR: 94 case SHOP_FLOOR:
94 if (!op->has_random_items ()) 95 if (!op->has_random_items ())
95 return 0; 96 return 0;
96 do 97 do
97 { 98 {
98 i = 10; /* let's give it 10 tries */ 99 i = 10; /* let's give it 10 tries */
99 while ((tmp = generate_treasure (op->randomitems, op->stats.exp ? op->stats.exp : 5)) == NULL && --i); 100 while ((tmp = generate_treasure (op->randomitems, op->stats.exp ? op->stats.exp : 5)) == NULL && --i);
100 if (tmp == NULL) 101 if (tmp == NULL)
101 return 0; 102 return 0;
102 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 103 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
103 { 104 {
104 tmp->destroy (); 105 tmp->destroy ();
105 tmp = NULL; 106 tmp = NULL;
106 } 107 }
107 } 108 }
108 while (!tmp); 109 while (!tmp);
109 110
110 tmp->x = op->x, tmp->y = op->y; 111 tmp->x = op->x, tmp->y = op->y;
111 SET_FLAG (tmp, FLAG_UNPAID); 112 SET_FLAG (tmp, FLAG_UNPAID);
112 insert_ob_in_map (tmp, op->map, NULL, 0); 113 insert_ob_in_map (tmp, op->map, NULL, 0);
113 CLEAR_FLAG (op, FLAG_AUTO_APPLY); 114 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
114 identify (tmp); 115 identify (tmp);
115 break; 116 break;
116 117
117 case TREASURE: 118 case TREASURE:
118 if (op->has_random_items ()) 119 if (op->has_random_items ())
119 while ((op->stats.hp--) > 0) 120 while ((op->stats.hp--) > 0)
120 create_treasure (op->randomitems, op, GT_ENVIRONMENT, 121 create_treasure (op->randomitems, op, GT_ENVIRONMENT,
121 op->stats.exp ? op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 122 op->stats.exp ? op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
122 op->remove (); 123 op->remove ();
123 op->destroy (); 124 op->destroy ();
124 break; 125 break;
125 } 126 }
126 127
127 return tmp ? 1 : 0; 128 return tmp ? 1 : 0;
128} 129}
129 130

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines