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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.62 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.131 by root, Sun Sep 21 23:21:49 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <object.h> 25#include <object.h>
26#include <tod.h> 26#include <tod.h>
27 27
28#ifdef HAVE_DES_H
29# include <des.h>
30#else
31# ifdef HAVE_CRYPT_H
32# include <crypt.h>
33# endif
34#endif
35
36#include <sproto.h> 28#include <sproto.h>
37#include <time.h> 29#include <time.h>
30
31#include <glib.h>
38 32
39#include <../random_maps/random_map.h> 33#include <../random_maps/random_map.h>
40#include <../random_maps/rproto.h> 34#include <../random_maps/rproto.h>
41#include "path.h" 35#include "path.h"
42 36
… …
45}; 39};
46 40
47void 41void
48version (object *op) 42version (object *op)
49{ 43{
50 if (op != NULL)
51 clear_win_info (op);
52
53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire v%s", VERSION); 44 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
54 45
55/* If in a socket, don't print out the list of authors. It confuses the 46#if 0
56 * crossclient program.
57 */
58 if (op == NULL)
59 return;
60 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 47 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
48 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
49 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
50 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
51 new_draw_info (NDI_UNIQUE, 0, op, "");
52 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
61 new_draw_info (NDI_UNIQUE, 0, op, "mwedel@sonic.net (Mark Wedel)"); 53 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
62 new_draw_info (NDI_UNIQUE, 0, op, "frankj@ifi.uio.no (Frank Tore Johansen)"); 54 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
63 new_draw_info (NDI_UNIQUE, 0, op, "kjetilho@ifi.uio.no (Kjetil Torgrim Homme)"); 55 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
64 new_draw_info (NDI_UNIQUE, 0, op, "tvangod@ecst.csuchico.edu (Tyler Van Gorder)"); 56 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
65 new_draw_info (NDI_UNIQUE, 0, op, "elmroth@cd.chalmers.se (Tony Elmroth)"); 57 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
66 new_draw_info (NDI_UNIQUE, 0, op, "dougal.scott@fcit.monasu.edu.au (Dougal Scott)"); 58 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
67 new_draw_info (NDI_UNIQUE, 0, op, "wchuang@athena.mit.edu (William)"); 59 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
68 new_draw_info (NDI_UNIQUE, 0, op, "ftww@cs.su.oz.au (Geoff Bailey)"); 60 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
69 new_draw_info (NDI_UNIQUE, 0, op, "jorgens@flipper.pvv.unit.no (Kjetil Wiekhorst Jxrgensen)"); 61 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
70 new_draw_info (NDI_UNIQUE, 0, op, "c.blackwood@rdt.monash.edu.au (Cameron Blackwood)"); 62 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
71 new_draw_info (NDI_UNIQUE, 0, op, "jtraub+@cmu.edu (Joseph L. Traub)"); 63 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
72 new_draw_info (NDI_UNIQUE, 0, op, "rgg@aaii.oz.au (Rupert G. Goldie)"); 64 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
73 new_draw_info (NDI_UNIQUE, 0, op, "eanders+@cmu.edu (Eric A. Anderson)"); 65 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
74 new_draw_info (NDI_UNIQUE, 0, op, "eneq@Prag.DoCS.UU.SE (Rickard Eneqvist)"); 66 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko.Sonninen@lut.fi (Jarkko Sonninen)"); 67 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>");
76 new_draw_info (NDI_UNIQUE, 0, op, "kholland@sunlab.cit.cornell.du (Karl Holland)"); 68 new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>");
77 new_draw_info (NDI_UNIQUE, 0, op, "vick@bern.docs.uu.se (Mikael Lundgren)"); 69 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>");
78 new_draw_info (NDI_UNIQUE, 0, op, "mol@meryl.csd.uu.se (Mikael Olsson)"); 70 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>");
79 new_draw_info (NDI_UNIQUE, 0, op, "Tero.Haatanen@lut.fi (Tero Haatanen)"); 71 new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>");
80 new_draw_info (NDI_UNIQUE, 0, op, "ylitalo@student.docs.uu.se (Lasse Ylitalo)"); 72 new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>");
81 new_draw_info (NDI_UNIQUE, 0, op, "anipa@guru.magic.fi (Niilo Neuvo)"); 73 new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>");
82 new_draw_info (NDI_UNIQUE, 0, op, "mta@modeemi.cs.tut.fi (Markku J{rvinen)"); 74 new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>");
83 new_draw_info (NDI_UNIQUE, 0, op, "meunier@inf.enst.fr (Sylvain Meunier)"); 75 new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>");
84 new_draw_info (NDI_UNIQUE, 0, op, "jfosback@darmok.uoregon.edu (Jason Fosback)"); 76 new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>");
85 new_draw_info (NDI_UNIQUE, 0, op, "cedman@capitalist.princeton.edu (Carl Edman)"); 77 new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>");
86 new_draw_info (NDI_UNIQUE, 0, op, "henrich@crh.cl.msu.edu (Charles Henrich)"); 78 new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>");
87 new_draw_info (NDI_UNIQUE, 0, op, "schmid@fb3-s7.math.tu-berlin.de (Gregor Schmid)"); 79 new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>");
88 new_draw_info (NDI_UNIQUE, 0, op, "quinet@montefiore.ulg.ac.be (Raphael Quinet)"); 80 new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>");
89 new_draw_info (NDI_UNIQUE, 0, op, "jam@modeemi.cs.tut.fi (Jari Vanhala)"); 81 new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>");
90 new_draw_info (NDI_UNIQUE, 0, op, "kivinen@joker.cs.hut.fi (Tero Kivinen)"); 82 new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>");
91 new_draw_info (NDI_UNIQUE, 0, op, "peterm@soda.berkeley.edu (Peter Mardahl)"); 83 new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>");
92 new_draw_info (NDI_UNIQUE, 0, op, "matt@cs.odu.edu (Matthew Zeher)"); 84 new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>");
93 new_draw_info (NDI_UNIQUE, 0, op, "srt@sun-dimas.aero.org (Scott R. Turner)"); 85 new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>");
94 new_draw_info (NDI_UNIQUE, 0, op, "huma@netcom.com (Ben Fennema)"); 86 new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>");
95 new_draw_info (NDI_UNIQUE, 0, op, "njw@cs.city.ac.uk (Nick Williams)"); 87 new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>");
96 new_draw_info (NDI_UNIQUE, 0, op, "Wacren@Gin.ObsPM.Fr (Laurent Wacrenier)"); 88 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
97 new_draw_info (NDI_UNIQUE, 0, op, "thomas@astro.psu.edu (Brian Thomas)"); 89 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
98 new_draw_info (NDI_UNIQUE, 0, op, "jsm@axon.ksc.nasa.gov (John Steven Moerk)"); 90 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
99 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David [david.delbecq@mailandnews.com]"); 91 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
100 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann [yann.chachkoff@mailandnews.com]\n"); 92 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
93 new_draw_info (NDI_UNIQUE, 0, op, "");
101 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 94 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
102 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
103 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais [david_eg@mail.com]"); 96 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
104 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura [ita@gold.koma.jaeri.go.jp]"); 97 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
105 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner [hansjoerg.malthaner@danet.de]"); 98 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
106 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg [maxmc@telia.com]"); 99 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
100 new_draw_info (NDI_UNIQUE, 0, op, "");
107 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 101 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
108} 102#endif
109
110void
111info_keys (object *op)
112{
113 clear_win_info (op);
114 new_draw_info (NDI_UNIQUE, 0, op, "Push `hjklynub' to walk in a direction.");
115 new_draw_info (NDI_UNIQUE, 0, op, "Shift + dir = fire, Ctrl + dir = run");
116 new_draw_info (NDI_UNIQUE, 0, op, "(To fire at yourself, hit `.'");
117 new_draw_info (NDI_UNIQUE, 0, op, "To attack, walk into the monsters.");
118 new_draw_info (NDI_UNIQUE, 0, op, "\" = speak ' = extended command");
119 new_draw_info (NDI_UNIQUE, 0, op, "i = inventory , = get : = look");
120 new_draw_info (NDI_UNIQUE, 0, op, "<> = rotate d = drop ? = help");
121 new_draw_info (NDI_UNIQUE, 0, op, "a = apply A = apply below t = throw");
122 new_draw_info (NDI_UNIQUE, 0, op, "e = examine E = exa below @ = autopick");
123 new_draw_info (NDI_UNIQUE, 0, op, "C = configure s = brace v = version");
124 new_draw_info (NDI_UNIQUE, 0, op, "+- = change range <tab> = browse spells");
125 new_draw_info (NDI_UNIQUE, 0, op, "x = change inventory type");
126 new_draw_info (NDI_UNIQUE, 0, op, "Mouse: L = examine, M = apply, R = drop/get");
127 new_draw_info (NDI_UNIQUE, 0, op, "'help = info about extended commands.");
128 new_draw_info (NDI_UNIQUE, 0, op, "Ctrl-R = refresh Ctrl-C = clear");
129 new_draw_info (NDI_UNIQUE, 0, op, "You can type a number before most commands.");
130 new_draw_info (NDI_UNIQUE, 0, op, "(For instance 3d drops 3 items.)");
131} 103}
132 104
133/* This is a basic little function to put the player back to his 105/* This is a basic little function to put the player back to his
134 * savebed. We do some error checking - its possible that the 106 * savebed. We do some error checking - its possible that the
135 * savebed map may no longer exist, so we make sure the player 107 * savebed map may no longer exist, so we make sure the player
136 * goes someplace. 108 * goes someplace.
137 */ 109 */
138void 110void
139enter_player_savebed (object *op) 111enter_player_savebed (object *op)
140{ 112{
141 maptile *oldmap = op->map; 113 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
142 object *tmp;
143
144 tmp = object::create ();
145
146 EXIT_PATH (tmp) = op->contr->savebed_map;
147 EXIT_X (tmp) = op->contr->bed_x;
148 EXIT_Y (tmp) = op->contr->bed_y;
149 op->enter_exit (tmp);
150
151 /* If the player has not changed maps and the name does not match
152 * that of the savebed, his savebed map is gone. Lets go back
153 * to the emergency path. Update what the players savebed is
154 * while we're at it.
155 */
156 //TODO: must go - move to interim map
157 if (oldmap == op->map && strcmp (op->contr->savebed_map, oldmap->path))
158 {
159 LOG (llevDebug, "Player %s savebed location %s is invalid - going to emergency location\n",
160 &op->name, op->contr->savebed_map);
161 strcpy (op->contr->savebed_map, "/world/world_105_115");
162 op->contr->bed_x = 5;
163 op->contr->bed_y = 37;
164 EXIT_PATH (tmp) = op->contr->savebed_map;
165 EXIT_X (tmp) = op->contr->bed_x;
166 EXIT_Y (tmp) = op->contr->bed_y;
167 op->enter_exit (tmp);
168 }
169
170 tmp->destroy ();
171} 114}
172 115
173/* 116/*
174 * enter_map(): Moves the player and pets from current map (if any) to 117 * enter_map(): Moves the player and pets from current map (if any) to
175 * new map. map, x, y must be set. map is the map we are moving the 118 * new map. map, x, y must be set. map is the map we are moving the
… …
178 * the function that calls this should figure them out. 121 * the function that calls this should figure them out.
179 */ 122 */
180void 123void
181object::enter_map (maptile *newmap, int x, int y) 124object::enter_map (maptile *newmap, int x, int y)
182{ 125{
183 if (!newmap->load ()) 126 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
184 return; 127 return;
185 128
186 if (out_of_map (newmap, x, y)) 129 if (out_of_map (newmap, x, y))
187 { 130 {
188 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 131 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
195 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 138 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
196 return; 139 return;
197 } 140 }
198 } 141 }
199 142
143 if (contr && map != newmap && map)
144 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
145 return;
146
147 // remove, so stupid ob_locked does not trigger a failure
148 remove ();
149
200 /* try to find a spot for the player */ 150 /* try to find a spot for the player */
201 if (ob_blocked (this, newmap, x, y)) 151 if (blocked (newmap, x, y))
202 { /* First choice blocked */ 152 { /* First choice blocked */
203 /* We try to find a spot for the player, starting closest in. 153 /* We try to find a spot for the player, starting closest in.
204 * We could use find_first_free_spot, but that doesn't randomize it at all, 154 * We could use find_first_free_spot, but that doesn't randomize it at all,
205 * So for example, if the north space is free, you would always end up there even 155 * So for example, if the north space is free, you would always end up there even
206 * if other spaces around are available. 156 * if other spaces around are available.
… …
224 else 174 else
225 /* not much we can do in this case. */ 175 /* not much we can do in this case. */
226 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y); 176 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y);
227 } 177 }
228 178
229 if (map) 179 if (contr && map != newmap)
230 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 180 {
231 return;
232
233 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 181 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
234 return; 182 return;
235 183
236 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 184 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
237 return; 185 return;
238 186 }
239 /* If it is a player login, he has yet to be inserted anyplace.
240 * otherwise, we need to deal with removing the player here.
241 */
242 remove ();
243 187
244 this->x = x; 188 this->x = x;
245 this->y = y; 189 this->y = y;
246 map = newmap; 190 map = newmap;
247 191
248 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 192 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
249 193
250 newmap->timeout = 0;
251 enemy = NULL; 194 enemy = 0;
252 195
253 if (contr) 196 if (contr)
254 { 197 {
255 strcpy (contr->maplevel, newmap->path); 198 contr->maplevel = newmap->path;
256 contr->count = 0; 199 contr->count = 0;
257 } 200 }
258 201
259 /* Update any golems */ 202 /* Update any golems */
260 if (type == PLAYER && contr->ranges[range_golem]) 203 if (type == PLAYER)
261 { 204 if (object *golem = contr->golem)
262 int i = find_free_spot (contr->ranges[range_golem], newmap,
263 x, y, 1, SIZEOFFREE);
264
265 contr->ranges[range_golem]->remove ();
266
267 if (i == -1)
268 { 205 {
269 remove_friendly_object (contr->ranges[range_golem]); 206 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
270 contr->ranges[range_golem]->destroy (); 207
271 contr->ranges[range_golem] = 0; 208 if (i < 0)
272 } 209 golem->destroy ();
273 else 210 else
274 {
275 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
276 { 211 {
277 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 212 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
278 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 213 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
279 tmp->map = newmap;
280 } 214 }
281
282 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
283 contr->ranges[range_golem]->direction =
284 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
285 } 215 }
286 }
287
288 direction = 0;
289 216
290 /* since the players map is already loaded, we don't need to worry 217 /* since the players map is already loaded, we don't need to worry
291 * about pending objects. 218 * about pending objects.
292 */ 219 */
293 remove_all_pets (newmap); 220 remove_all_pets (newmap);
294}
295
296/* clean_path takes a path and replaces all / with _
297 * We do a strcpy so that we do not change the original string.
298 */
299char *
300clean_path (const char *file)
301{
302 static char newpath[MAX_BUF], *cp;
303 assign (newpath, file);
304
305 for (cp = newpath; *cp != '\0'; cp++)
306 if (*cp == '/')
307 *cp = '_';
308
309 return newpath;
310}
311
312/* unclean_path takes a path and replaces all _ with /
313 * This basically undoes clean path.
314 * We do a strcpy so that we do not change the original string.
315 * We are smart enough to start after the last / in case we
316 * are getting passed a string that points to a unique map
317 * path.
318 */
319char *
320unclean_path (const char *src)
321{
322 static char newpath[MAX_BUF], *cp;
323
324 cp = strrchr (src, '/');
325 assign (newpath, cp ? cp + 1 : src);
326
327 for (cp = newpath; *cp != '\0'; cp++)
328 if (*cp == '_')
329 *cp = '/';
330
331 return newpath;
332} 221}
333 222
334/* process_players1 and process_players2 do all the player related stuff. 223/* process_players1 and process_players2 do all the player related stuff.
335 * I moved it out of process events and process_map. This was to some 224 * I moved it out of process events and process_map. This was to some
336 * extent for debugging as well as to get a better idea of the time used 225 * extent for debugging as well as to get a better idea of the time used
… …
339 * is needed after the players have been updated. 228 * is needed after the players have been updated.
340 */ 229 */
341static void 230static void
342process_players1 () 231process_players1 ()
343{ 232{
344 int flag;
345
346 /* Basically, we keep looping until all the players have done their actions. */ 233 /* Basically, we keep looping until all the players have done their actions. */
347 for (flag = 1; flag != 0;) 234 for (int flag = 1; flag != 0;)
348 { 235 {
349 flag = 0; 236 flag = 0;
350 for_all_players (pl) 237 for_all_players (pl)
351 { 238 {
352 pl->refcnt_chk (); 239 pl->refcnt_chk ();
353 240
354 if (!pl->ob || !pl->ns) 241 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
355 continue; 242 continue;
356 243
357 if (pl->ob->speed_left > 0)
358 if (handle_newcs_player (pl->ob)) 244 if (handle_newcs_player (pl->ob))
359 flag = 1; 245 flag = 1;
360
361 /* If the player is not actively playing, don't make a
362 * backup save - nothing to save anyway. Plus, the
363 * map may not longer be valid. This can happen when the
364 * player quits - they exist for purposes of tracking on the map,
365 * but don't actually reside on any actual map.
366 */
367 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
368 continue;
369
370#ifdef AUTOSAVE
371 /* check for ST_PLAYING state so that we don't try to save off when
372 * the player is logging in.
373 */
374 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
375 {
376 pl->ob->contr->save ();
377 pl->last_save_tick = pticks;
378 } 246 }
379#endif 247 }
380 } /* end of for loop for all the players */
381 } /* for flag */
382 248
383 for_all_players (pl) 249 for_all_players (pl)
384 { 250 {
385 if (!pl->ob || !pl->ns) 251 object *ob = pl->ob;
252
253 if (expect_false (!ob || !pl->ns || !ob->active))
386 continue; 254 continue;
387 255
388 if (settings.casting_time)
389 {
390 if (pl->ob->casting_time > 0)
391 {
392 pl->ob->casting_time--;
393 pl->ob->start_holding = 1;
394 }
395
396 /* set spell_state so we can update the range in stats field */
397 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
398 pl->ob->start_holding = 0;
399 }
400
401 do_some_living (pl->ob); 256 do_some_living (ob);
402 } 257 }
403} 258}
404 259
405static void 260static void
406process_players2 () 261process_players2 ()
407{ 262{
408 /* Then check if any players should use weapon-speed instead of speed */ 263 /* Then check if any players should use weapon-speed instead of speed */
409 for_all_players (pl) 264 for_all_players (pl)
410 { 265 {
411 /* The code that did weapon_sp handling here was out of place - 266 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
412 * this isn't called until after the player has finished there 267 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
413 * actions, and is thus out of place. All we do here is bounds
414 * checking.
415 */
416 if (pl->has_hit)
417 {
418 if (pl->ob->speed_left > pl->weapon_sp)
419 pl->ob->speed_left = pl->weapon_sp;
420
421 /* This needs to be here - if the player is running, we need to
422 * clear this each tick, but new commands are not being received
423 * so execute_newserver_command() is never called
424 */
425 pl->has_hit = 0;
426 }
427 else if (pl->ob->speed_left > pl->ob->speed)
428 pl->ob->speed_left = pl->ob->speed;
429 } 268 }
430} 269}
431 270
432void 271void
433process_events () 272process_events ()
434{ 273{
435 object *op;
436
437 static object_ptr marker_;
438
439 if (!marker_)
440 marker_ = object::create ();
441
442 object *marker = marker_;
443
444 process_players1 (); 274 process_players1 ();
445 275
446 marker->active_next = active_objects; 276 for_all_actives (op)
447
448 if (marker->active_next)
449 marker->active_next->active_prev = marker;
450
451 marker->active_prev = 0;
452 active_objects = marker;
453
454 while (marker->active_next)
455 { 277 {
456 op = marker->active_next;
457
458 /* Move marker forward - swap op and marker */
459 op->active_prev = marker->active_prev;
460
461 if (op->active_prev)
462 op->active_prev->active_next = op;
463 else
464 active_objects = op;
465
466 marker->active_next = op->active_next;
467
468 if (marker->active_next)
469 marker->active_next->active_prev = marker;
470
471 marker->active_prev = op;
472 op->active_next = marker;
473
474 /* Now process op */ 278 /* Now process op */
475 if (QUERY_FLAG (op, FLAG_FREED)) 279 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
476 { 280 {
477 LOG (llevError, "BUG: process_events(): Free object on list\n"); 281 LOG (llevError, "BUG: process_events(): Free object on list\n");
478 op->set_speed (0); 282 op->set_speed (0);
479 continue; 283 continue;
480 } 284 }
481 285
482 /* I've seen occasional crashes due to this - the object is removed, 286 if (expect_false (!op->has_active_speed ()))
483 * and thus the map it points to (last map it was on) may be bogus
484 * The real bug is to try to find out the cause of this - someone
485 * is probably calling remove_ob without either an insert_ob or
486 * free_object afterwards, leaving an object dangling. But I'd
487 * rather log this and continue on instead of crashing.
488 * Don't remove players - when a player quits, the object is in
489 * sort of a limbo, of removed, but something we want to keep
490 * around.
491 */
492 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
493 {
494 LOG (llevError, "BUG: process_events(): Removed object on list\n");
495 char *dump = dump_object (op);
496 LOG (llevError, dump);
497 free (dump);
498 op->destroy ();
499 continue;
500 } 287 {
501
502 if (!op->speed)
503 {
504 LOG (llevError, "BUG: process_events(): Object %s has no speed, " 288 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
505 "but is on active list\n", &op->arch->name); 289 "but is on active list\n", op->debug_desc (), op->speed);
506 op->set_speed (0); 290 op->set_speed (0);
507 continue; 291 continue;
508 } 292 }
509 293
510 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 294 if (expect_false (op->flag [FLAG_REMOVED]))
511 { 295 {
512 LOG (llevError, "BUG: process_events(): Object without map or " 296 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
513 "inventory is on active list: %s (%d)\n", &op->name, op->count); 297 op->debug_desc ());
514 op->set_speed (0); 298 op->set_speed (0);
515 continue; 299 continue;
516 } 300 }
517 301
518 /* Animate the object. Bug or feature that anim_speed 302 /* Animate the object. Bug or feature that anim_speed
519 * is based on ticks, and not the creatures speed? 303 * is based on ticks, and not the creatures speed?
520 */ 304 */
521 if (op->anim_speed && op->last_anim >= op->anim_speed) 305 if (op->anim_speed && op->last_anim >= op->anim_speed)
522 { 306 {
523 if ((op->type == PLAYER))
524 animate_object (op, op->facing);
525 else
526 animate_object (op, op->direction); 307 animate_object (op, op->contr ? op->facing : op->direction);
527
528 op->last_anim = 1; 308 op->last_anim = 1;
529 } 309 }
530 else 310 else
531 op->last_anim++; 311 ++op->last_anim;
532 312
533 if (op->speed_left > 0) 313 if (expect_false (op->speed_left > 0.f))
534 {
535#if 0
536 /* I've seen occasional crashes in move_symptom() with it
537 * crashing because op is removed - add some debugging to
538 * track if it is removed at this point.
539 * This unfortunately is a bit too verbose it seems - not sure
540 * why - I think what happens is a map is freed or something and
541 * some objects get 'lost' - removed never to be reclaimed.
542 * removed objects generally shouldn't exist.
543 */
544 if (QUERY_FLAG (op, FLAG_REMOVED))
545 { 314 {
546 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
547 }
548#endif
549 --op->speed_left; 315 --op->speed_left;
550 process_object (op); 316 process_object (op);
551
552 if (op->destroyed ())
553 continue;
554 } 317 }
555 318
556 if (settings.casting_time == TRUE && op->casting_time > 0) 319 if (expect_true (!op->contr))
557 op->casting_time--; 320 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
558
559 if (op->speed_left <= 0)
560 op->speed_left += FABS (op->speed);
561 } 321 }
562
563 /* Remove marker object from active list */
564 if (marker->active_prev != NULL)
565 marker->active_prev->active_next = NULL;
566 else
567 active_objects = NULL;
568 322
569 process_players2 (); 323 process_players2 ();
570} 324}
571 325
572/* clean up everything before exiting */ 326/* clean up everything before exiting */
573void 327void
574emergency_save () 328emergency_save ()
575{ 329{
576 LOG (llevDebug, "emergency save begin.\n"); 330 LOG (llevDebug, "emergency save begin.\n");
577 331
578 LOG (llevDebug, "saving players.\n");
579 for_all_players (pl)
580 pl->save (1);
581
582// for_all_players (pl)
583// if (pl->ob)
584// pl->ob->remove ();
585
586 LOG (llevDebug, "saving maps.\n");
587 maptile::emergency_save (); 332 cfperl_emergency_save ();
588 333
589 LOG (llevDebug, "saving book archive.\n"); 334 LOG (llevDebug, "saving book archive.\n");
590 write_book_archive (); 335 write_book_archive ();
591 336
592 LOG (llevDebug, "emergency save done.\n"); 337 LOG (llevDebug, "emergency save done.\n");
593} 338}
594 339
340// send all clients some informational text
341static void
342cleanup_inform (const char *cause, bool make_core)
343{
344 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
345
346 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
347 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
348
349 if (make_core)
350 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
351 else
352 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
353
354 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
355
356 client::flush_sockets ();
357}
358
595/* clean up everything before exiting */ 359/* clean up everything before exiting */
596void 360void
597cleanup (bool make_core) 361cleanup (const char *cause, bool make_core)
598{ 362{
363 if (make_core)
364 fork_abort (cause);
365
366 LOG (llevError, "cleanup cause: %s\n", cause);
367
368 if (!make_core)
369 cleanup_inform (cause, make_core);
370
599 LOG (llevDebug, "cleanup begin.\n"); 371 LOG (llevDebug, "cleanup begin.\n");
600 372
373 if (init_done && !in_cleanup)
374 {
601 in_cleanup = true; 375 in_cleanup = true;
602
603 if (init_done)
604 emergency_save (); 376 emergency_save ();
377 }
378 else
379 in_cleanup = true;
605 380
606 LOG (llevDebug, "running cleanup handlers.\n"); 381 LOG (llevDebug, "running cleanup handlers.\n");
607 INVOKE_GLOBAL (CLEANUP); 382 INVOKE_GLOBAL (CLEANUP);
608 383
609 LOG (llevDebug, "cleanup done.\n"); 384 LOG (llevDebug, "cleanup done.\n");
610 385
386 log_cleanup ();
387
611 if (make_core) 388 if (make_core)
612 abort (); 389 cleanup_inform (cause, make_core);
613 else 390 else
614 _exit (0);
615}
616
617void
618leave (player *pl, int draw_exit)
619{
620 if (pl)
621 {
622 if (pl->ob->type != DEAD_OBJECT)
623 {
624 /* If a hidden dm dropped connection do not create
625 * inconsistencies by showing that they have left the game
626 */
627 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
628 && draw_exit)
629 {
630 if (pl->ob->map)
631 {
632 INVOKE_PLAYER (LOGOUT, pl);
633 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
634 }
635
636 char buf[MAX_BUF];
637
638 sprintf (buf, "%s left the game.", &pl->ob->name);
639 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
640 }
641
642 pl->ob->remove ();
643 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
644 }
645
646 /* We do this so that the socket handling routine can do the final
647 * cleanup. We also leave that loop to actually handle the freeing
648 * of the data.
649 */
650 if (pl->ns)
651 pl->ns->destroy ();
652
653 } 391 {
654} 392 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
655 393 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
656int 394 client::flush_sockets ();
657forbid_play (void)
658{
659#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
660 char buf[MAX_BUF], day[MAX_BUF];
661 FILE *fp;
662 time_t clock;
663 struct tm *tm;
664 int i, start, stop, forbit = 0, comp;
665
666 clock = time (NULL);
667 tm = (struct tm *) localtime (&clock);
668
669 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
670 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
671 return 0;
672
673 while (fgets (buf, MAX_BUF, fp))
674 { 395 }
675 if (buf[0] == '#')
676 continue;
677 if (!strncmp (buf, "msg", 3))
678 {
679 if (forbit)
680 while (fgets (buf, MAX_BUF, fp)) /* print message */
681 fputs (buf, logfile);
682 break;
683 396
684 } 397 cfperl_cleanup (make_core);
685 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 398 _exit (make_core);
686 {
687 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
688 continue;
689 }
690
691 for (i = 0; i < 7; i++)
692 {
693 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
694 forbit = 1;
695 }
696 }
697
698 close_and_delete (fp, comp);
699
700 return forbit;
701#else
702 return 0;
703#endif
704} 399}
705 400
706/* 401/*
707 * do_specials() is a collection of functions to call from time to time. 402 * do_specials() is a collection of functions to call from time to time.
708 * Modified 2000-1-14 MSW to use the global pticks count to determine how 403 * Modified 2000-1-14 MSW to use the global pticks count to determine how
709 * often to do things. This will allow us to spred them out more often. 404 * often to do things. This will allow us to spred them out more often.
710 * I use prime numbers for the factor count - in that way, it is less likely 405 * I use prime numbers for the factor count - in that way, it is less likely
711 * these actions will fall on the same tick (compared to say using 500/2500/15000 406 * these actions will fall on the same tick (compared to say using 500/2500/15000
712 * which would mean on that 15,000 tick count a whole bunch of stuff gets 407 * which would mean on that 15,000 tick count a whole bunch of stuff gets
… …
714 * done on the same tick, but that will happen very infrequently 409 * done on the same tick, but that will happen very infrequently
715 * 410 *
716 * I also think this code makes it easier to see how often we really are 411 * I also think this code makes it easier to see how often we really are
717 * doing the various things. 412 * doing the various things.
718 */ 413 */
719
720extern unsigned long todtick;
721
722void 414void
723do_specials (void) 415do_specials (void)
724{ 416{
725 if (!(pticks % PTICKS_PER_CLOCK))
726 tick_the_clock ();
727
728 if (!(pticks % 7))
729 shstr::gc (); 417 shstr::gc ();
418 archetype::gc ();
730 419
420 if (expect_false (!(pticks % TICKS_PER_HOUR)))
421 adjust_daylight ();
422
731 if (!(pticks % 2503)) 423 if (expect_false (!(pticks % 2503)))
732 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 424 fix_weight (); /* Hack to fix weightproblems caused by bugs */
733 425
734 if (!(pticks % 5003)) 426 if (expect_false (!(pticks % 5003)))
735 write_book_archive (); 427 write_book_archive ();
736 428
737 if (!(pticks % 5009)) 429 if (expect_false (!(pticks % 5009)))
738 clean_friendly_list (); 430 clean_friendly_list ();
739 431
740 if (!(pticks % 5011)) 432 if (expect_false (!(pticks % 5011)))
741 obsolete_parties (); 433 obsolete_parties ();
742 434
743 if (!(pticks % 12503)) 435 if (expect_false (!(pticks % 12503)))
744 fix_luck (); 436 fix_luck ();
745} 437}
746 438
747void 439void
748server_tick () 440server_tick ()
749{ 441{
750 // first do the user visible stuff 442 // first do the user visible stuff
751 doeric_server ();
752 INVOKE_GLOBAL (CLOCK); 443 INVOKE_GLOBAL (CLOCK);
753 process_events (); /* "do" something with objects with speed */ 444 process_events (); // "do" something with objects with speed
754 flush_sockets (); 445 client::clock (); // draw client maps etc.
755 446
756 // then do some bookkeeping, should not really be here 447 // then do some bookkeeping, should not really be here
757 do_specials (); /* Routines called from time to time. */ 448 do_specials (); /* Routines called from time to time. */
758 attachable::check_mortals (); 449 attachable::check_mortals ();
759 450
760 ++pticks; 451 ++pticks;
761} 452}
762 453
454#if 0
455// used fro benchmarking (x86/amd64-specific)
456typedef unsigned long tval;
457typedef unsigned long long stamp64;
458
459extern inline tval
460stamp (void)
461{
462 tval tsc;
463 asm volatile ("rdtsc":"=a" (tsc)::"edx");
464
465 return tsc;
466}
467
468extern inline tval
469measure (tval t)
470{
471 tval tsc;
472 asm volatile ("rdtsc":"=a" (tsc)::"edx");
473
474 if (tsc > t)
475 return tsc - t;
476 else
477 return t - tsc;
478}
479
763int 480int
764main (int argc, char **argv) 481main (int argc, char **argv)
765{ 482{
483 rand_gen rg(0);
484 tval fastest = 0x7fffffff;
485 for (int loop = 10000; loop--; )
486 {
487 tval s = stamp ();
488 volatile int i = rg.get_int(25);
489 fastest = min (fastest, measure (s));
490 }
491
492 //printf ("fastest %d\n", fastest);
493 for (int i = 0; i < 1024*1024*3; ++i)
494 {
495 char c = rg.get_int (256);
496 write (2, &c, 1);
497 }
498}
499
500#else
501
502#if 0 // just goofing around, look elsewhere
503
504#include <malloc.h>
505#include <execinfo.h>
506
507static void tr_on ();
508static void tr_off ();
509
510static SMUTEX(tr_mutex);
511
512#define ltr_off() SMUTEX_LOCK (tr_mutex); tr_off ()
513#define ltr_on() tr_on (); SMUTEX_UNLOCK (tr_mutex);
514
515static void *
516tr_malloc (size_t size, const void *caller)
517{
518 ltr_off ();
519
520 void *bt [8];
521 backtrace (bt, 8);
522
523 void *ptr = malloc (size);
524
525 ltr_on ();
526 return (char *)ptr;
527}
528
529static void
530tr_free (void *ptr, const void *caller)
531{
532 ltr_off ();
533
534 free (ptr);
535
536 ltr_on ();
537}
538
539void static *
540tr_realloc (void *ptr, size_t size, const void *caller)
541{
542 ltr_off ();
543
544 void *nptr = realloc (ptr, size);
545
546 ltr_on ();
547 return nptr;
548}
549
550static void *
551tr_memalign (size_t size, size_t alignment, const void *caller)
552{
553 ltr_off ();
554
555 void *ptr = memalign (size, alignment < 16 ? 16 : alignment);
556
557 ltr_on ();
558 return ptr;
559}
560
561static void
562tr_on ()
563{
564 __malloc_hook = tr_malloc;
565 __realloc_hook = tr_realloc;
566 __free_hook = tr_free;
567 __memalign_hook = tr_memalign;
568}
569
570static void
571tr_off ()
572{
573 __malloc_hook = 0;
574 __realloc_hook = 0;
575 __free_hook = 0;
576 __memalign_hook = 0;
577}
578
579void (*__malloc_initialize_hook)(void) = tr_on;
580
581#endif
582
583// normal main
584int
585main (int argc, char **argv)
586{
766 settings.argc = argc; 587 settings.argc = argc;
767 settings.argv = argv; 588 settings.argv = argv;
768 589
590 g_thread_init (0); // for the slice allocator only
591
769 init (argc, argv); 592 init (argc, argv);
770
771 initPlugins ();
772 593
773 for (;;) 594 for (;;)
774 cfperl_main (); 595 cfperl_main ();
775
776 // unreached
777 cleanup ();
778
779 return 0;
780} 596}
597#endif
598
599#if 0
600int xyzzy ()
601{
602 return rndm(8);
603}
604
605void xyzzy (object_ptr &a, object_ptr &o)
606{
607 asm volatile ("int3");
608 a = o;
609 asm volatile ("int3");
610}
611#endif
612

Diff Legend

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