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

Comparing deliantra/server/common/compat.C (file contents):
Revision 1.10 by root, Thu Apr 29 15:49:04 2010 UTC vs.
Revision 1.16 by root, Mon Oct 29 23:55:52 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* 25/*
26 * compatibility functions for older (GPL) source code parts 26 * compatibility functions for older (GPL) source code parts
… …
34 34
35#include <global.h> 35#include <global.h>
36#include "define.h" 36#include "define.h"
37#include "path.h" 37#include "path.h"
38 38
39
40/* buf_overflow() - we don't want to exceed the buffer size of 39/* buf_overflow() - we don't want to exceed the buffer size of
41 * buf1 by adding on buf2! Returns true if overflow will occur. 40 * buf1 by adding on buf2! Returns true if overflow will occur.
42 */ 41 */
43int 42int
44buf_overflow (const char *buf1, const char *buf2, int bufsize) 43buf_overflow (const char *buf1, const char *buf2, int bufsize)
… …
53 52
54 if ((len1 + len2) >= bufsize) 53 if ((len1 + len2) >= bufsize)
55 return 1; 54 return 1;
56 55
57 return 0; 56 return 0;
58}
59
60/////////////////////////////////////////////////////////////////////////////
61
62/*
63 * fatal() is meant to be called whenever a fatal signal is intercepted.
64 * It will call the emergency_save and the clean_tmp_files functions.
65 */
66//TODO: only one caller left
67void
68fatal (const char *msg)
69{
70 LOG (llevError, "FATAL: %s\n", msg);
71 cleanup (msg, 1);
72} 57}
73 58
74///////////////////////////////////////////////////////////////////////////// 59/////////////////////////////////////////////////////////////////////////////
75 60
76/* 61/*
… …
87 * and if goodbad is non-zero, luck increases the roll, if zero, it decreases. 72 * and if goodbad is non-zero, luck increases the roll, if zero, it decreases.
88 * Generally, op should be the player/caster/hitter requesting the roll, 73 * Generally, op should be the player/caster/hitter requesting the roll,
89 * not the recipient (ie, the poor slob getting hit). [garbled 20010916] 74 * not the recipient (ie, the poor slob getting hit). [garbled 20010916]
90 */ 75 */
91int 76int
92random_roll (int r_min, int r_max, const object *op, int goodbad) 77random_roll (int r_min, int r_max, const object *op, bool prefer_high)
93{ 78{
94 r_max = max (r_min, r_max); 79 if (r_min > r_max)
80 swap (r_min, r_max);
95 81
82 int range = r_max - r_min + 1;
83 int num = rndm (r_min, r_max);
84
85 if (op->stats.luck)
86 {
96 int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */ 87 int base = range > 2 ? 20 : 50; /* d2 and d3 are corner cases */
97 88
98 if (op->type == PLAYER)
99 {
100 int luck = op->stats.luck;
101
102 if (rndm (base) < min (10, abs (luck))) 89 if (rndm (base) < min (10, abs (op->stats.luck)))
103 {
104 //TODO: take luck into account
105 } 90 {
106 } 91 // we have a winner, increase/decrease number by one accordingly
92 int adjust = sign (op->stats.luck);
107 93
108 return rndm (r_min, r_max); 94 if (!prefer_high)
95 adjust = -adjust;
96
97 num = clamp (num + adjust, r_min, r_max);
98 }
99 }
100
101 return num;
109} 102}
110 103
111/* 104/*
112 * This is a 64 bit version of random_roll above. This is needed 105 * This is a 64 bit version of random_roll above. This is needed
113 * for exp loss calculations for players changing religions. 106 * for exp loss calculations for players changing religions.
114 */ 107 */
115sint64 108sint64
116random_roll64 (sint64 r_min, sint64 r_max, const object *op, int goodbad) 109random_roll64 (sint64 r_min, sint64 r_max, const object *op, bool prefer_high)
117{ 110{
118 sint64 omin = r_min; 111 if (r_min > r_max)
112 swap (r_min, r_max);
113
119 sint64 range = max (0, r_max - r_min + 1); 114 sint64 range = r_max - r_min + 1;
120 int base = range > 2 ? 20 : 50; /* d2 and d3 are corner cases */
121
122 /* 115 /*
123 * Make a call to get two 32 bit unsigned random numbers, and just do 116 * Make a call to get two 32 bit unsigned random numbers, and just do
124 * a little bitshifting. 117 * a little bitshifting.
125 */ 118 */
126 sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); 119 sint64 num = rndm.next () ^ (sint64 (rndm.next ()) << 31);
120
121 num = num % range + r_min;
127 122
128 if (op->stats.luck) 123 if (op->stats.luck)
129 { 124 {
130 int luck = op->stats.luck; 125 int base = range > 2 ? 20 : 50; /* d2 and d3 are corner cases */
131 126
132 if (rndm (base) < min (10, abs (luck))) 127 if (rndm (base) < min (10, abs (op->stats.luck)))
133 { 128 {
134 /* we have a winner */ 129 // we have a winner, increase/decrease number by one accordingly
135 luck = luck > 0 ? 1 : -1; 130 int adjust = sign (op->stats.luck);
131
132 if (!prefer_high)
133 adjust = -adjust;
136 134
137 range -= luck; 135 num = clamp (num + adjust, r_min, r_max);
138 if (range < 1)
139 return omin; /*check again */
140
141 if (goodbad)
142 r_min += luck;
143
144 return (max (omin, min (r_max, (ran % range) + r_min)));
145 } 136 }
146 } 137 }
147 138
148 return ran % range + r_min; 139 return num;
149} 140}
150 141
151/* 142/*
152 * Roll a number of dice (2d3, 4d6). Uses op to determine luck, 143 * Roll a number of dice (2d3, 4d6). Uses op to determine luck,
153 * If goodbad is non-zero, luck increases the roll, if zero, it decreases. 144 * If goodbad is non-zero, luck increases the roll, if zero, it decreases.
154 * Generally, op should be the player/caster/hitter requesting the roll, 145 * Generally, op should be the player/caster/hitter requesting the roll,
155 * not the recipient (ie, the poor slob getting hit). 146 * not the recipient (ie, the poor slob getting hit).
156 * The args are num D size (ie 4d6) [garbled 20010916] 147 * The args are num D size (ie 4d6) [garbled 20010916]
157 */ 148 */
158int 149int
159die_roll (int num, int size, const object *op, int goodbad) 150die_roll (int num, int size, const object *op, bool prefer_high)
160{ 151{
161 int min_roll, luck, total, i, gotlucky; 152 int min_roll, luck, total, i, gotlucky;
162 153
163 int diff = size; 154 int diff = size;
164 min_roll = 1; 155 min_roll = 1;
165 luck = total = gotlucky = 0; 156 luck = total = gotlucky = 0;
166 int base = diff > 2 ? 20 : 50; /* d2 and d3 are corner cases */ 157 int base = diff > 2 ? 20 : 50; /* d2 and d3 are corner cases */
167 158
168 if (size < 2 || diff < 1) 159 if (size < 2 || diff < 1)
169 { 160 {
170 LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size); 161 LOG (llevError | logBacktrace, "Calling die_roll with num=%d size=%d\n", num, size);
171 return num; /* avoids a float exception */ 162 return num; /* avoids a float exception */
172 } 163 }
173 164
174 if (op->type == PLAYER) 165 if (op->type == PLAYER)
175 luck = op->stats.luck; 166 luck = op->stats.luck;
… …
182 gotlucky++; 173 gotlucky++;
183 ((luck > 0) ? (luck = 1) : (luck = -1)); 174 ((luck > 0) ? (luck = 1) : (luck = -1));
184 diff -= luck; 175 diff -= luck;
185 if (diff < 1) 176 if (diff < 1)
186 return (num); /*check again */ 177 return (num); /*check again */
187 ((goodbad) ? (min_roll += luck) : (diff)); 178 ((prefer_high) ? (min_roll += luck) : (diff));
188 total += max (1, min (size, rndm (diff) + min_roll)); 179 total += max (1, min (size, rndm (diff) + min_roll));
189 } 180 }
190 else 181 else
191 total += rndm (size) + 1; 182 total += rndm (size) + 1;
192 } 183 }

Diff Legend

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