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.77 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.78 by root, Fri May 16 17:09:38 2008 UTC

93 * not the recipient (ie, the poor slob getting hit). [garbled 20010916] 93 * not the recipient (ie, the poor slob getting hit). [garbled 20010916]
94 */ 94 */
95int 95int
96random_roll (int r_min, int r_max, const object *op, int goodbad) 96random_roll (int r_min, int r_max, const object *op, int goodbad)
97{ 97{
98 r_max = max (r_min, r_max);
99
98 int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */ 100 int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */
99
100 if (r_max < r_min)
101 {
102 LOG (llevError | logBacktrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max);
103 return r_min;
104 }
105 101
106 if (op->type == PLAYER) 102 if (op->type == PLAYER)
107 { 103 {
108 int luck = op->stats.luck; 104 int luck = op->stats.luck;
109 105
119/* 115/*
120 * This is a 64 bit version of random_roll above. This is needed 116 * This is a 64 bit version of random_roll above. This is needed
121 * for exp loss calculations for players changing religions. 117 * for exp loss calculations for players changing religions.
122 */ 118 */
123sint64 119sint64
124random_roll64 (sint64 min, sint64 max, const object *op, int goodbad) 120random_roll64 (sint64 r_min, sint64 r_max, const object *op, int goodbad)
125{ 121{
126 sint64 omin = min; 122 sint64 omin = r_min;
127 sint64 diff = max - min + 1; 123 sint64 range = max (0, r_max - r_min + 1);
128 int base = diff > 2 ? 20 : 50; /* d2 and d3 are corner cases */ 124 int base = range > 2 ? 20 : 50; /* d2 and d3 are corner cases */
129
130 if (diff < 0)
131 {
132 LOG (llevError | logBacktrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max);
133 return (min); /* avoids a float exception */
134 }
135 125
136 /* 126 /*
137 * Make a call to get two 32 bit unsigned random numbers, and just to 127 * Make a call to get two 32 bit unsigned random numbers, and just to
138 * a little bitshifting. 128 * a little bitshifting.
139 */ 129 */
140 sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); 130 sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
141 131
142 if (op->type != PLAYER) 132 if (op->type != PLAYER)
143 return ((ran % diff) + min); 133 return ((ran % range) + r_min);
144 134
145 int luck = op->stats.luck; 135 int luck = op->stats.luck;
146 136
147 if (rndm (base) < MIN (10, abs (luck))) 137 if (rndm (base) < min (10, abs (luck)))
148 { 138 {
149 /* we have a winner */ 139 /* we have a winner */
150 ((luck > 0) ? (luck = 1) : (luck = -1)); 140 ((luck > 0) ? (luck = 1) : (luck = -1));
151 diff -= luck; 141 range -= luck;
152 if (diff < 1) 142 if (range < 1)
153 return (omin); /*check again */ 143 return (omin); /*check again */
154 144
155 ((goodbad) ? (min += luck) : (diff)); 145 ((goodbad) ? (r_min += luck) : (range));
156 146
157 return (MAX (omin, MIN (max, (ran % diff) + min))); 147 return (max (omin, min (r_max, (ran % range) + r_min)));
158 } 148 }
159 149
160 return ran % diff + min; 150 return ran % range + r_min;
161} 151}
162 152
163/* 153/*
164 * Roll a number of dice (2d3, 4d6). Uses op to determine luck, 154 * Roll a number of dice (2d3, 4d6). Uses op to determine luck,
165 * If goodbad is non-zero, luck increases the roll, if zero, it decreases. 155 * If goodbad is non-zero, luck increases the roll, if zero, it decreases.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines