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.31 by root, Sun Sep 17 14:22:29 2006 UTC vs.
Revision 1.63 by root, Sat Dec 30 16:56:16 2006 UTC

… …
31# ifdef HAVE_CRYPT_H 31# ifdef HAVE_CRYPT_H
32# include <crypt.h> 32# include <crypt.h>
33# endif 33# endif
34#endif 34#endif
35 35
36#ifndef __CEXTRACT__
37# include <sproto.h> 36#include <sproto.h>
38#endif
39
40#ifdef HAVE_TIME_H
41# include <time.h> 37#include <time.h>
42#endif
43 38
44#include <../random_maps/random_map.h> 39#include <../random_maps/random_map.h>
45#include <../random_maps/rproto.h> 40#include <../random_maps/rproto.h>
46#include "path.h" 41#include "path.h"
47 42
… …
60/* If in a socket, don't print out the list of authors. It confuses the 55/* If in a socket, don't print out the list of authors. It confuses the
61 * crossclient program. 56 * crossclient program.
62 */ 57 */
63 if (op == NULL) 58 if (op == NULL)
64 return; 59 return;
60
65 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 61 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
62 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
66 new_draw_info (NDI_UNIQUE, 0, op, "mwedel@sonic.net (Mark Wedel)"); 65 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
67 new_draw_info (NDI_UNIQUE, 0, op, "frankj@ifi.uio.no (Frank Tore Johansen)"); 66 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
68 new_draw_info (NDI_UNIQUE, 0, op, "kjetilho@ifi.uio.no (Kjetil Torgrim Homme)"); 67 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
69 new_draw_info (NDI_UNIQUE, 0, op, "tvangod@ecst.csuchico.edu (Tyler Van Gorder)"); 68 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
70 new_draw_info (NDI_UNIQUE, 0, op, "elmroth@cd.chalmers.se (Tony Elmroth)"); 69 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
71 new_draw_info (NDI_UNIQUE, 0, op, "dougal.scott@fcit.monasu.edu.au (Dougal Scott)"); 70 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
72 new_draw_info (NDI_UNIQUE, 0, op, "wchuang@athena.mit.edu (William)"); 71 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
73 new_draw_info (NDI_UNIQUE, 0, op, "ftww@cs.su.oz.au (Geoff Bailey)"); 72 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
74 new_draw_info (NDI_UNIQUE, 0, op, "jorgens@flipper.pvv.unit.no (Kjetil Wiekhorst Jxrgensen)"); 73 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jxrgensen <jorgens@flipper.pvv.unit.no>");
75 new_draw_info (NDI_UNIQUE, 0, op, "c.blackwood@rdt.monash.edu.au (Cameron Blackwood)"); 74 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
76 new_draw_info (NDI_UNIQUE, 0, op, "jtraub+@cmu.edu (Joseph L. Traub)"); 75 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
77 new_draw_info (NDI_UNIQUE, 0, op, "rgg@aaii.oz.au (Rupert G. Goldie)"); 76 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
78 new_draw_info (NDI_UNIQUE, 0, op, "eanders+@cmu.edu (Eric A. Anderson)"); 77 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
79 new_draw_info (NDI_UNIQUE, 0, op, "eneq@Prag.DoCS.UU.SE (Rickard Eneqvist)"); 78 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
80 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko.Sonninen@lut.fi (Jarkko Sonninen)"); 79 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>");
81 new_draw_info (NDI_UNIQUE, 0, op, "kholland@sunlab.cit.cornell.du (Karl Holland)"); 80 new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>");
82 new_draw_info (NDI_UNIQUE, 0, op, "vick@bern.docs.uu.se (Mikael Lundgren)"); 81 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>");
83 new_draw_info (NDI_UNIQUE, 0, op, "mol@meryl.csd.uu.se (Mikael Olsson)"); 82 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>");
84 new_draw_info (NDI_UNIQUE, 0, op, "Tero.Haatanen@lut.fi (Tero Haatanen)"); 83 new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>");
85 new_draw_info (NDI_UNIQUE, 0, op, "ylitalo@student.docs.uu.se (Lasse Ylitalo)"); 84 new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>");
86 new_draw_info (NDI_UNIQUE, 0, op, "anipa@guru.magic.fi (Niilo Neuvo)"); 85 new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>");
87 new_draw_info (NDI_UNIQUE, 0, op, "mta@modeemi.cs.tut.fi (Markku J{rvinen)"); 86 new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>");
88 new_draw_info (NDI_UNIQUE, 0, op, "meunier@inf.enst.fr (Sylvain Meunier)"); 87 new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>");
89 new_draw_info (NDI_UNIQUE, 0, op, "jfosback@darmok.uoregon.edu (Jason Fosback)"); 88 new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>");
90 new_draw_info (NDI_UNIQUE, 0, op, "cedman@capitalist.princeton.edu (Carl Edman)"); 89 new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>");
91 new_draw_info (NDI_UNIQUE, 0, op, "henrich@crh.cl.msu.edu (Charles Henrich)"); 90 new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>");
92 new_draw_info (NDI_UNIQUE, 0, op, "schmid@fb3-s7.math.tu-berlin.de (Gregor Schmid)"); 91 new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>");
93 new_draw_info (NDI_UNIQUE, 0, op, "quinet@montefiore.ulg.ac.be (Raphael Quinet)"); 92 new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>");
94 new_draw_info (NDI_UNIQUE, 0, op, "jam@modeemi.cs.tut.fi (Jari Vanhala)"); 93 new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>");
95 new_draw_info (NDI_UNIQUE, 0, op, "kivinen@joker.cs.hut.fi (Tero Kivinen)"); 94 new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>");
96 new_draw_info (NDI_UNIQUE, 0, op, "peterm@soda.berkeley.edu (Peter Mardahl)"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>");
97 new_draw_info (NDI_UNIQUE, 0, op, "matt@cs.odu.edu (Matthew Zeher)"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>");
98 new_draw_info (NDI_UNIQUE, 0, op, "srt@sun-dimas.aero.org (Scott R. Turner)"); 97 new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>");
99 new_draw_info (NDI_UNIQUE, 0, op, "huma@netcom.com (Ben Fennema)"); 98 new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>");
100 new_draw_info (NDI_UNIQUE, 0, op, "njw@cs.city.ac.uk (Nick Williams)"); 99 new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>");
101 new_draw_info (NDI_UNIQUE, 0, op, "Wacren@Gin.ObsPM.Fr (Laurent Wacrenier)"); 100 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
102 new_draw_info (NDI_UNIQUE, 0, op, "thomas@astro.psu.edu (Brian Thomas)"); 101 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
103 new_draw_info (NDI_UNIQUE, 0, op, "jsm@axon.ksc.nasa.gov (John Steven Moerk)"); 102 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
104 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David [david.delbecq@mailandnews.com]"); 103 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
105 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann [yann.chachkoff@mailandnews.com]\n"); 104 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
105
106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
108 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais [david_eg@mail.com]"); 108 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
109 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura [ita@gold.koma.jaeri.go.jp]"); 109 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
110 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner [hansjoerg.malthaner@danet.de]"); 110 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
111 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg [maxmc@telia.com]"); 111 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
113}
114
115void
116info_keys (object *op)
117{
118 clear_win_info (op);
119 new_draw_info (NDI_UNIQUE, 0, op, "Push `hjklynub' to walk in a direction.");
120 new_draw_info (NDI_UNIQUE, 0, op, "Shift + dir = fire, Ctrl + dir = run");
121 new_draw_info (NDI_UNIQUE, 0, op, "(To fire at yourself, hit `.'");
122 new_draw_info (NDI_UNIQUE, 0, op, "To attack, walk into the monsters.");
123 new_draw_info (NDI_UNIQUE, 0, op, "\" = speak ' = extended command");
124 new_draw_info (NDI_UNIQUE, 0, op, "i = inventory , = get : = look");
125 new_draw_info (NDI_UNIQUE, 0, op, "<> = rotate d = drop ? = help");
126 new_draw_info (NDI_UNIQUE, 0, op, "a = apply A = apply below t = throw");
127 new_draw_info (NDI_UNIQUE, 0, op, "e = examine E = exa below @ = autopick");
128 new_draw_info (NDI_UNIQUE, 0, op, "C = configure s = brace v = version");
129 new_draw_info (NDI_UNIQUE, 0, op, "+- = change range <tab> = browse spells");
130 new_draw_info (NDI_UNIQUE, 0, op, "x = change inventory type");
131 new_draw_info (NDI_UNIQUE, 0, op, "Mouse: L = examine, M = apply, R = drop/get");
132 new_draw_info (NDI_UNIQUE, 0, op, "'help = info about extended commands.");
133 new_draw_info (NDI_UNIQUE, 0, op, "Ctrl-R = refresh Ctrl-C = clear");
134 new_draw_info (NDI_UNIQUE, 0, op, "You can type a number before most commands.");
135 new_draw_info (NDI_UNIQUE, 0, op, "(For instance 3d drops 3 items.)");
136}
137
138void
139start_info (object *op)
140{
141 char buf[MAX_BUF];
142
143 sprintf (buf, "Welcome to Crossfire, v%s!", VERSION);
144 new_draw_info (NDI_UNIQUE, 0, op, buf);
145 new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
146 new_draw_info (NDI_UNIQUE, 0, op, " ");
147 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, op, "%s entered the game.", &op->name);
148 if (!op->contr->name_changed)
149 {
150 new_draw_info (NDI_UNIQUE, 0, op, "Note that you must set your name with the name");
151 new_draw_info (NDI_UNIQUE, 0, op, "command to enter the highscore list.");
152 new_draw_info (NDI_UNIQUE, 0, op, "(You can also use the crossfire.name X-resource.)");
153 }
154}
155
156/* Really, there is no reason to crypt the passwords any system. But easier
157 * to just leave this enabled for backward compatibility. Put the
158 * simple case at top - no encryption - makes it easier to read.
159 */
160char *
161crypt_string (char *str, char *salt)
162{
163#if defined(WIN32) || (defined(__FreeBSD__) && !defined(HAVE_LIBDES))
164 return (str);
165#else
166 static char *c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
167 char s[2];
168
169 if (salt == NULL)
170 s[0] = c[RANDOM () % (int) strlen (c)], s[1] = c[RANDOM () % (int) strlen (c)];
171 else
172 s[0] = salt[0], s[1] = salt[1];
173
174# ifdef HAVE_LIBDES
175 return (char *) des_crypt (str, s);
176# endif
177 /* Default case - just use crypt */
178 return (char *) crypt (str, s);
179#endif
180}
181
182int
183check_password (char *typed, char *crypted)
184{
185 return !strcmp (crypt_string (typed, crypted), crypted);
186} 113}
187 114
188/* This is a basic little function to put the player back to his 115/* This is a basic little function to put the player back to his
189 * savebed. We do some error checking - its possible that the 116 * savebed. We do some error checking - its possible that the
190 * savebed map may no longer exist, so we make sure the player 117 * savebed map may no longer exist, so we make sure the player
191 * goes someplace. 118 * goes someplace.
192 */ 119 */
193void 120void
194enter_player_savebed (object *op) 121enter_player_savebed (object *op)
195{ 122{
196 maptile *oldmap = op->map; 123 object *tmp = object::create ();
197 object *tmp;
198
199 tmp = get_object ();
200
201 EXIT_PATH (tmp) = op->contr->savebed_map; 124 EXIT_PATH (tmp) = op->contr->savebed_map;
202 EXIT_X (tmp) = op->contr->bed_x; 125 EXIT_X (tmp) = op->contr->bed_x;
203 EXIT_Y (tmp) = op->contr->bed_y; 126 EXIT_Y (tmp) = op->contr->bed_y;
204 enter_exit (op, tmp); 127 op->enter_exit (tmp);
205 /* If the player has not changed maps and the name does not match 128 tmp->destroy ();
206 * that of the savebed, his savebed map is gone. Lets go back
207 * to the emergency path. Update what the players savebed is
208 * while we're at it.
209 */
210 if (oldmap == op->map && strcmp (op->contr->savebed_map, oldmap->path))
211 {
212 LOG (llevDebug, "Player %s savebed location %s is invalid - going to emergency location (%s)\n",
213 settings.emergency_mapname, &op->name, op->contr->savebed_map);
214 strcpy (op->contr->savebed_map, settings.emergency_mapname);
215 op->contr->bed_x = settings.emergency_x;
216 op->contr->bed_y = settings.emergency_y;
217 EXIT_PATH (tmp) = op->contr->savebed_map;
218 EXIT_X (tmp) = op->contr->bed_x;
219 EXIT_Y (tmp) = op->contr->bed_y;
220 enter_exit (op, tmp);
221 }
222 free_object (tmp);
223}
224
225/* All this really is is a glorified remove_object that also updates
226 * the counts on the map if needed.
227 */
228void
229leave_map (object *op)
230{
231 maptile *oldmap = op->map;
232
233 remove_ob (op);
234
235 if (oldmap)
236 {
237 if (!op->contr->hidden)
238 oldmap->players--;
239 if (oldmap->players <= 0)
240 { /* can be less than zero due to errors in tracking this */
241 set_map_timeout (oldmap);
242 }
243 }
244} 129}
245 130
246/* 131/*
247 * enter_map(): Moves the player and pets from current map (if any) to 132 * enter_map(): Moves the player and pets from current map (if any) to
248 * new map. map, x, y must be set. map is the map we are moving the 133 * new map. map, x, y must be set. map is the map we are moving the
249 * player to - it could be the map he just came from if the load failed for 134 * player to - it could be the map he just came from if the load failed for
250 * whatever reason. If default map coordinates are to be used, then 135 * whatever reason. If default map coordinates are to be used, then
251 * the function that calls this should figure them out. 136 * the function that calls this should figure them out.
252 */ 137 */
253static void 138void
254enter_map (object *op, maptile *newmap, int x, int y) 139object::enter_map (maptile *newmap, int x, int y)
255{ 140{
256 maptile *oldmap = op->map; 141 if (!newmap->load ())
142 return;
257 143
258 if (out_of_map (newmap, x, y)) 144 if (out_of_map (newmap, x, y))
259 { 145 {
260 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", newmap->path, x, y); 146 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
261 x = MAP_ENTER_X (newmap); 147 x = newmap->enter_x;
262 y = MAP_ENTER_Y (newmap); 148 y = newmap->enter_y;
263 if (out_of_map (newmap, x, y)) 149 if (out_of_map (newmap, x, y))
264 { 150 {
265 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n", 151 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n",
266 newmap->path, x, y, MAP_WIDTH (newmap), MAP_HEIGHT (newmap)); 152 &newmap->path, x, y, newmap->width, newmap->height);
267 new_draw_info (NDI_UNIQUE, 0, op, "The exit is closed"); 153 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
268 return; 154 return;
269 } 155 }
270 } 156 }
271 157
272 /* try to find a spot for the player */ 158 /* try to find a spot for the player */
273 if (ob_blocked (op, newmap, x, y)) 159 if (ob_blocked (this, newmap, x, y))
274 { /* First choice blocked */ 160 { /* First choice blocked */
275 /* We try to find a spot for the player, starting closest in. 161 /* We try to find a spot for the player, starting closest in.
276 * We could use find_first_free_spot, but that doesn't randomize it at all, 162 * We could use find_first_free_spot, but that doesn't randomize it at all,
277 * So for example, if the north space is free, you would always end up there even 163 * So for example, if the north space is free, you would always end up there even
278 * if other spaces around are available. 164 * if other spaces around are available.
279 * Note that for the second and third calls, we could start at a position other 165 * Note that for the second and third calls, we could start at a position other
280 * than one, but then we could end up on the other side of walls and so forth. 166 * than one, but then we could end up on the other side of walls and so forth.
281 */ 167 */
282 int i = find_free_spot (op, newmap, x, y, 1, SIZEOFFREE1 + 1); 168 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1);
283 169
284 if (i == -1) 170 if (i == -1)
285 { 171 {
286 i = find_free_spot (op, newmap, x, y, 1, SIZEOFFREE2 + 1); 172 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
287 if (i == -1) 173 if (i == -1)
288 i = find_free_spot (op, newmap, x, y, 1, SIZEOFFREE); 174 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
289 } 175 }
290 176
291 if (i != -1) 177 if (i != -1)
292 { 178 {
293 x += freearr_x[i]; 179 x += freearr_x[i];
294 y += freearr_y[i]; 180 y += freearr_y[i];
295 } 181 }
296 else 182 else
297 {
298 /* not much we can do in this case. */ 183 /* not much we can do in this case. */
299 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); 184 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);
300 } 185 }
301 } /* end if looking for free spot */
302 186
303 if (op->map != NULL) 187 if (map)
304 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) 188 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
305 return; 189 return;
306 190
307 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 191 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
308 return; 192 return;
309 193
310 if (INVOKE_MAP (ENTER, op->map, ARG_PLAYER (op->contr), ARG_INT (x), ARG_INT (y))) 194 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
311 return; 195 return;
312 196
313 /* If it is a player login, he has yet to be inserted anyplace. 197 /* If it is a player login, he has yet to be inserted anyplace.
314 * otherwise, we need to deal with removing the player here. 198 * otherwise, we need to deal with removing the player here.
315 */ 199 */
316 remove_ob (op); 200 remove ();
317 201
318 /* remove_ob clears these so they must be reset after the remove_ob call */
319 op->x = x; 202 this->x = x;
320 op->y = y; 203 this->y = y;
321 op->map = newmap; 204 map = newmap;
322 205
323 insert_ob_in_map (op, op->map, NULL, INS_NO_WALK_ON); 206 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
324
325 if (!op->contr->hidden)
326 newmap->players++;
327 207
328 newmap->timeout = 0; 208 newmap->timeout = 0;
329 op->enemy = NULL; 209 enemy = NULL;
330 210
331 if (op->contr) 211 if (contr)
332 { 212 {
333 strcpy (op->contr->maplevel, newmap->path); 213 strcpy (contr->maplevel, newmap->path);
334 op->contr->count = 0; 214 contr->count = 0;
335 } 215 }
336 216
337 /* Update any golems */ 217 /* Update any golems */
338 if (op->type == PLAYER && op->contr->ranges[range_golem] != NULL) 218 if (type == PLAYER && contr->ranges[range_golem])
339 { 219 {
340 int i = find_free_spot (op->contr->ranges[range_golem], newmap, 220 int i = find_free_spot (contr->ranges[range_golem], newmap,
341 x, y, 1, SIZEOFFREE); 221 x, y, 1, SIZEOFFREE);
342 222
343 remove_ob (op->contr->ranges[range_golem]); 223 contr->ranges[range_golem]->remove ();
344 224
345 if (i == -1) 225 if (i == -1)
346 { 226 {
347 remove_friendly_object (op->contr->ranges[range_golem]); 227 remove_friendly_object (contr->ranges[range_golem]);
348 free_object (op->contr->ranges[range_golem]); 228 contr->ranges[range_golem]->destroy ();
349 op->contr->ranges[range_golem] = NULL; 229 contr->ranges[range_golem] = 0;
350 op->contr->golem_count = 0;
351 } 230 }
352 else 231 else
353 { 232 {
354 for (object *tmp = op->contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more) 233 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
355 { 234 {
356 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 235 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x);
357 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 236 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y);
358 tmp->map = newmap; 237 tmp->map = newmap;
359 } 238 }
360 239
361 insert_ob_in_map (op->contr->ranges[range_golem], newmap, NULL, 0); 240 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
362 op->contr->ranges[range_golem]->direction = 241 contr->ranges[range_golem]->direction =
363 find_dir_2 (op->x - op->contr->ranges[range_golem]->x, op->y - op->contr->ranges[range_golem]->y); 242 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
364 } 243 }
365 } 244 }
366 245
367 op->direction = 0; 246 direction = 0;
368 247
369 /* since the players map is already loaded, we don't need to worry 248 /* since the players map is already loaded, we don't need to worry
370 * about pending objects. 249 * about pending objects.
371 */ 250 */
372 remove_all_pets (newmap); 251 remove_all_pets (newmap);
373
374 /* If the player is changing maps, we need to do some special things
375 * Do this after the player is on the new map - otherwise the force swap of the
376 * old map does not work.
377 */
378 if (oldmap != newmap)
379 {
380 if (oldmap) /* adjust old map */
381 {
382 oldmap->players--;
383
384 if (oldmap->players <= 0) /* can be less than zero due to errors in tracking this */
385 set_map_timeout (oldmap);
386 }
387 }
388} 252}
389
390void
391set_map_timeout (maptile *oldmap)
392{
393#if MAP_MAXTIMEOUT
394 oldmap->timeout = MAP_TIMEOUT (oldmap);
395 /* Do MINTIMEOUT first, so that MAXTIMEOUT is used if that is
396 * lower than the min value.
397 */
398# if MAP_MINTIMEOUT
399 if (oldmap->timeout < MAP_MINTIMEOUT)
400 oldmap->timeout = MAP_MINTIMEOUT;
401# endif
402
403 if (oldmap->timeout > MAP_MAXTIMEOUT)
404 oldmap->timeout = MAP_MAXTIMEOUT;
405
406#else
407 /* save out the map */
408 swap_map (oldmap);
409#endif /* MAP_MAXTIMEOUT */
410}
411
412 253
413/* clean_path takes a path and replaces all / with _ 254/* clean_path takes a path and replaces all / with _
414 * We do a strcpy so that we do not change the original string. 255 * We do a strcpy so that we do not change the original string.
415 */ 256 */
416char * 257char *
… …
423 if (*cp == '/') 264 if (*cp == '/')
424 *cp = '_'; 265 *cp = '_';
425 266
426 return newpath; 267 return newpath;
427} 268}
428
429 269
430/* unclean_path takes a path and replaces all _ with / 270/* unclean_path takes a path and replaces all _ with /
431 * This basically undoes clean path. 271 * This basically undoes clean path.
432 * We do a strcpy so that we do not change the original string. 272 * We do a strcpy so that we do not change the original string.
433 * We are smart enough to start after the last / in case we 273 * We are smart enough to start after the last / in case we
… …
447 *cp = '/'; 287 *cp = '/';
448 288
449 return newpath; 289 return newpath;
450} 290}
451 291
452
453/* The player is trying to enter a randomly generated map. In this case, generate the
454 * random map as needed.
455 */
456
457static void
458enter_random_map (object *pl, object *exit_ob)
459{
460 maptile *new_map;
461 char newmap_name[HUGE_BUF], *cp;
462 static int reference_number = 0;
463 RMParms rp;
464
465 memset (&rp, 0, sizeof (RMParms));
466 rp.Xsize = -1;
467 rp.Ysize = -1;
468 rp.region = get_region_by_map (exit_ob->map);
469 if (exit_ob->msg)
470 set_random_map_variable (&rp, exit_ob->msg);
471 rp.origin_x = exit_ob->x;
472 rp.origin_y = exit_ob->y;
473 strcpy (rp.origin_map, pl->map->path);
474
475 /* If we have a final_map, use it as a base name to give some clue
476 * as where the player is. Otherwise, use the origin map.
477 * Take the last component (after the last slash) to give
478 * shorter names without bogus slashes.
479 */
480 if (rp.final_map[0])
481 {
482 cp = strrchr (rp.final_map, '/');
483 if (!cp)
484 cp = rp.final_map;
485 }
486 else
487 {
488 char buf[HUGE_BUF];
489
490 cp = strrchr (rp.origin_map, '/');
491 if (!cp)
492 cp = rp.origin_map;
493 /* Need to strip of any trailing digits, if it has them */
494 strcpy (buf, cp);
495 while (isdigit (buf[strlen (buf) - 1]))
496 buf[strlen (buf) - 1] = 0;
497 cp = buf;
498 }
499
500 sprintf (newmap_name, "/random/%s%04d", cp + 1, reference_number++);
501
502 /* now to generate the actual map. */
503 new_map = generate_random_map (newmap_name, &rp);
504
505 /* Update the exit_ob so it now points directly at the newly created
506 * random maps. Not that it is likely to happen, but it does mean that a
507 * exit in a unique map leading to a random map will not work properly.
508 * It also means that if the created random map gets reset before
509 * the exit leading to it, that the exit will no longer work.
510 */
511 if (new_map)
512 {
513 int x, y;
514
515 x = EXIT_X (exit_ob) = MAP_ENTER_X (new_map);
516 y = EXIT_Y (exit_ob) = MAP_ENTER_Y (new_map);
517 EXIT_PATH (exit_ob) = newmap_name;
518 strcpy (new_map->path, newmap_name);
519 enter_map (pl, new_map, x, y);
520 }
521}
522
523/* The player is trying to enter a non-randomly generated template map. In this
524 * case, use a map file for a template
525 */
526
527static void
528enter_fixed_template_map (object *pl, object *exit_ob)
529{
530 maptile *new_map;
531 char tmpnum[32], exitpath[HUGE_BUF], resultname[HUGE_BUF], tmpstring[HUGE_BUF], *sourcemap;
532 const char *new_map_name;
533
534 /* Split the exit path string into two parts, one
535 * for where to store the map, and one for were
536 * to generate the map from.
537 */
538 snprintf (exitpath, sizeof (exitpath), "%s", EXIT_PATH (exit_ob) + 2);
539 sourcemap = strchr (exitpath, '!');
540 if (!sourcemap)
541 {
542 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is closed.", &exit_ob->name);
543 /* Should only occur when no source map is set.
544 */
545 LOG (llevError, "enter_fixed_template_map: Exit %s (%d,%d) on map %s has no source template.\n",
546 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
547 return;
548 }
549
550 *sourcemap++ = '\0';
551
552 /* If we are not coming from a template map, we can use relative directories
553 * for the map to generate from.
554 */
555 if (!exit_ob->map->templatemap)
556 sourcemap = path_combine_and_normalize (exit_ob->map->path, sourcemap);
557
558 /* Do replacement of %x, %y, and %n to the x coord of the exit, the y coord
559 * of the exit, and the name of the map the exit is on, respectively.
560 */
561 sprintf (tmpnum, "%d", exit_ob->x);
562 replace (exitpath, "%x", tmpnum, resultname, sizeof (resultname));
563
564 sprintf (tmpnum, "%d", exit_ob->y);
565 sprintf (tmpstring, "%s", resultname);
566 replace (tmpstring, "%y", tmpnum, resultname, sizeof (resultname));
567
568 sprintf (tmpstring, "%s", resultname);
569 replace (tmpstring, "%n", exit_ob->map->name, resultname, sizeof (resultname));
570
571 /* If we are coming from another template map, use reletive paths unless
572 * indicated otherwise.
573 */
574 if (exit_ob->map->templatemap && (resultname[0] != '/'))
575 new_map_name = path_combine_and_normalize (exit_ob->map->path, resultname);
576 else
577 new_map_name = create_template_pathname (resultname);
578
579 /* Attempt to load the map, if unable to, then
580 * create the map from the template.
581 */
582 new_map = ready_map_name (new_map_name, MAP_PLAYER_UNIQUE);
583 if (!new_map)
584 {
585 new_map = load_original_map (create_pathname (sourcemap), MAP_PLAYER_UNIQUE);
586 if (new_map)
587 fix_auto_apply (new_map);
588 }
589
590 if (new_map)
591 {
592 /* set the path of the map to where it should be
593 * so we don't just save over the source map.
594 */
595 strcpy (new_map->path, new_map_name);
596 new_map->templatemap = 1;
597 enter_map (pl, new_map, EXIT_X (exit_ob), EXIT_Y (exit_ob));
598 }
599 else
600 {
601 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is closed.", &exit_ob->name);
602 /* Should only occur when an invalid source map is set.
603 */
604 LOG (llevDebug, "enter_fixed_template_map: Exit %s (%d,%d) on map %s leads no where.\n",
605 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
606 }
607}
608
609/* The player is trying to enter a randomly generated template map. In this
610 * case, generate the map as needed.
611 */
612
613static void
614enter_random_template_map (object *pl, object *exit_ob)
615{
616 maptile *new_map;
617 char tmpnum[32], resultname[HUGE_BUF], tmpstring[HUGE_BUF];
618 const char *new_map_name;
619 RMParms rp;
620
621 /* Do replacement of %x, %y, and %n to the x coord of the exit, the y coord
622 * of the exit, and the name of the map the exit is on, respectively.
623 */
624 sprintf (tmpnum, "%d", exit_ob->x);
625 replace (EXIT_PATH (exit_ob) + 3, "%x", tmpnum, resultname, sizeof (resultname));
626
627 sprintf (tmpnum, "%d", exit_ob->y);
628 sprintf (tmpstring, "%s", resultname);
629 replace (tmpstring, "%y", tmpnum, resultname, sizeof (resultname));
630
631 sprintf (tmpstring, "%s", resultname);
632 replace (tmpstring, "%n", exit_ob->map->name, resultname, sizeof (resultname));
633
634 /* If we are coming from another template map, use reletive paths unless
635 * indicated otherwise.
636 */
637 if (exit_ob->map->templatemap && (resultname[0] != '/'))
638 {
639 new_map_name = path_combine_and_normalize (exit_ob->map->path, resultname);
640 }
641 else
642 {
643 new_map_name = create_template_pathname (resultname);
644 }
645
646 new_map = ready_map_name (new_map_name, MAP_PLAYER_UNIQUE);
647 if (!new_map)
648 {
649 memset (&rp, 0, sizeof (RMParms));
650 rp.Xsize = -1;
651 rp.Ysize = -1;
652 rp.region = get_region_by_map (exit_ob->map);
653 if (exit_ob->msg)
654 set_random_map_variable (&rp, exit_ob->msg);
655 rp.origin_x = exit_ob->x;
656 rp.origin_y = exit_ob->y;
657 strcpy (rp.origin_map, pl->map->path);
658
659 /* now to generate the actual map. */
660 new_map = generate_random_map (new_map_name, &rp);
661 }
662
663
664 /* Update the exit_ob so it now points directly at the newly created
665 * random maps. Not that it is likely to happen, but it does mean that a
666 * exit in a unique map leading to a random map will not work properly.
667 * It also means that if the created random map gets reset before
668 * the exit leading to it, that the exit will no longer work.
669 */
670 if (new_map)
671 {
672 int x, y;
673
674 x = EXIT_X (exit_ob) = MAP_ENTER_X (new_map);
675 y = EXIT_Y (exit_ob) = MAP_ENTER_Y (new_map);
676 new_map->templatemap = 1;
677 enter_map (pl, new_map, x, y);
678 }
679}
680
681
682/* Code to enter/detect a character entering a unique map.
683 */
684static void
685enter_unique_map (object *op, object *exit_ob)
686{
687 char apartment[HUGE_BUF];
688 maptile *newmap;
689
690 if (EXIT_PATH (exit_ob)[0] == '/')
691 {
692 sprintf (apartment, "%s/%s/%s/%s", settings.localdir, settings.playerdir, &op->name, clean_path (EXIT_PATH (exit_ob)));
693 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
694 if (!newmap)
695 {
696 newmap = load_original_map (create_pathname (EXIT_PATH (exit_ob)), MAP_PLAYER_UNIQUE);
697 if (newmap)
698 fix_auto_apply (newmap);
699 }
700 }
701 else
702 { /* relative directory */
703 char reldir[HUGE_BUF], tmpc[HUGE_BUF], *cp;
704
705 if (exit_ob->map->unique)
706 {
707
708 strcpy (reldir, unclean_path (exit_ob->map->path));
709
710 /* Need to copy this over, as clean_path only has one static return buffer */
711 strcpy (tmpc, clean_path (reldir));
712 /* Remove final component, if any */
713 if ((cp = strrchr (tmpc, '_')) != NULL)
714 *cp = 0;
715
716 sprintf (apartment, "%s/%s/%s/%s_%s", settings.localdir, settings.playerdir, &op->name, tmpc, clean_path (EXIT_PATH (exit_ob)));
717
718 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
719 if (!newmap)
720 {
721 newmap = load_original_map (create_pathname (path_combine_and_normalize (reldir, EXIT_PATH (exit_ob))), MAP_PLAYER_UNIQUE);
722 if (newmap)
723 fix_auto_apply (newmap);
724 }
725 }
726 else
727 {
728 /* The exit is unique, but the map we are coming from is not unique. So
729 * use the basic logic - don't need to demangle the path name
730 */
731 sprintf (apartment, "%s/%s/%s/%s", settings.localdir,
732 settings.playerdir, &op->name, clean_path (path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob))));
733 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
734 if (!newmap)
735 {
736 newmap = ready_map_name (path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)), 0);
737 if (newmap)
738 fix_auto_apply (newmap);
739 }
740 }
741 }
742
743 if (newmap)
744 {
745 strcpy (newmap->path, apartment);
746 newmap->unique = 1;
747 enter_map (op, newmap, EXIT_X (exit_ob), EXIT_Y (exit_ob));
748 }
749 else
750 {
751 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", &exit_ob->name);
752 /* Perhaps not critical, but I would think that the unique maps
753 * should be new enough this does not happen. This also creates
754 * a strange situation where some players could perhaps have visited
755 * such a map before it was removed, so they have the private
756 * map, but other players can't get it anymore.
757 */
758 LOG (llevDebug, "enter_unique_map: Exit %s (%d,%d) on map %s is leads no where.\n",
759 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
760 }
761
762}
763
764
765/* Tries to move 'op' to exit_ob. op is the character or monster that is
766 * using the exit, where exit_ob is the exit object (boat, door, teleporter,
767 * etc.) if exit_ob is null, then op->contr->maplevel contains that map to
768 * move the object to. This is used when loading the player.
769 *
770 * Largely redone by MSW 2001-01-21 - this function was overly complex
771 * and had some obscure bugs.
772 */
773
774void
775enter_exit (object *op, object *exit_ob)
776{
777#define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */
778 object *tmp;
779
780 /* It may be nice to support other creatures moving across
781 * exits, but right now a lot of the code looks at op->contr,
782 * so thta is an RFE.
783 */
784 if (op->type != PLAYER)
785 return;
786
787 /* First, lets figure out what map the player is going to go to */
788 if (exit_ob)
789 {
790
791 /* check to see if we make a template map */
792 if (EXIT_PATH (exit_ob) && EXIT_PATH (exit_ob)[1] == '@')
793 {
794 if (EXIT_PATH (exit_ob)[2] == '!')
795 {
796 /* generate a template map randomly */
797 enter_random_template_map (op, exit_ob);
798 }
799 else
800 {
801 /* generate a template map from a fixed template */
802 enter_fixed_template_map (op, exit_ob);
803 }
804 }
805 /* check to see if we make a randomly generated map */
806 else if (EXIT_PATH (exit_ob) && EXIT_PATH (exit_ob)[1] == '!')
807 {
808 enter_random_map (op, exit_ob);
809 }
810 else if (QUERY_FLAG (exit_ob, FLAG_UNIQUE))
811 {
812 enter_unique_map (op, exit_ob);
813 }
814 else
815 {
816 int x = EXIT_X (exit_ob), y = EXIT_Y (exit_ob);
817
818 /* 'Normal' exits that do not do anything special
819 * Simple enough we don't need another routine for it.
820 */
821 maptile *newmap;
822
823 if (exit_ob->map)
824 {
825 newmap = ready_map_name (path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)), 0);
826 /* Random map was previously generated, but is no longer about. Lets generate a new
827 * map.
828 */
829 if (!newmap && !strncmp (EXIT_PATH (exit_ob), "/random/", 8))
830 {
831 /* Maps that go down have a message set. However, maps that go
832 * up, don't. If the going home has reset, there isn't much
833 * point generating a random map, because it won't match the maps.
834 */
835 if (exit_ob->msg)
836 {
837 enter_random_map (op, exit_ob);
838 }
839 else
840 {
841 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", &exit_ob->name);
842 return;
843 }
844
845 /* For exits that cause damages (like pits). Don't know if any
846 * random maps use this or not.
847 */
848 if (exit_ob->stats.dam && op->type == PLAYER)
849 hit_player (op, exit_ob->stats.dam, exit_ob, exit_ob->attacktype, 1);
850 return;
851 }
852 }
853 else
854 {
855 /* For word of recall and other force objects
856 * They contain the full pathname of the map to go back to,
857 * so we don't need to normalize it.
858 * But we do need to see if it is unique or not
859 */
860 if (!strncmp (EXIT_PATH (exit_ob), settings.localdir, strlen (settings.localdir)))
861 newmap = ready_map_name (EXIT_PATH (exit_ob), MAP_PLAYER_UNIQUE);
862 else
863 newmap = ready_map_name (EXIT_PATH (exit_ob), 0);
864 }
865 if (!newmap)
866 {
867 if (exit_ob->name)
868 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", &exit_ob->name);
869 /* don't cry to momma if name is not set - as in tmp objects
870 * used by the savebed code and character creation */
871 return;
872 }
873
874 /* This supports the old behaviour, but it really should not be used.
875 * I will note for example that with this method, it is impossible to
876 * set 0,0 destination coordinates. Really, if we want to support
877 * using the new maps default coordinates, the exit ob should use
878 * something like -1, -1 so it is clear to do that.
879 */
880 if (x == 0 && y == 0)
881 {
882 x = MAP_ENTER_X (newmap);
883 y = MAP_ENTER_Y (newmap);
884 LOG (llevDebug, "enter_exit: Exit %s (%d,%d) on map %s is 0 destination coordinates\n",
885 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map ? exit_ob->map->path : "<nil>");
886 }
887
888 /* mids 02/13/2002 if exit is damned, update players death & WoR home-position and delete town portal */
889 if (QUERY_FLAG (exit_ob, FLAG_DAMNED))
890 {
891 /* remove an old force with a slaying field == PORTAL_DESTINATION_NAME */
892 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
893 {
894 if (tmp->type == FORCE && tmp->slaying && !strcmp (tmp->slaying, PORTAL_DESTINATION_NAME))
895 break;
896 }
897 if (tmp)
898 {
899 remove_ob (tmp);
900 free_object (tmp);
901 }
902
903 strcpy (op->contr->savebed_map, path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)));
904 op->contr->bed_x = EXIT_X (exit_ob), op->contr->bed_y = EXIT_Y (exit_ob);
905 save_player (op, 1);
906 /* LOG(llevDebug,"enter_exit: Taking damned exit %s to (%d,%d) on map %s\n",
907 * exit_ob->name?exit_ob->name:"(none)", exit_ob->x, exit_ob->y,
908 * path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob))); */
909 }
910
911 enter_map (op, newmap, x, y);
912 }
913 /* For exits that cause damages (like pits) */
914 if (exit_ob->stats.dam && op->type == PLAYER)
915 hit_player (op, exit_ob->stats.dam, exit_ob, exit_ob->attacktype, 1);
916 }
917 else
918 {
919 int flags = 0;
920 maptile *newmap;
921
922
923 /* Hypothetically, I guess its possible that a standard map matches
924 * the localdir, but that seems pretty unlikely - unlikely enough that
925 * I'm not going to attempt to try to deal with that possibility.
926 * We use the fact that when a player saves on a unique map, it prepends
927 * the localdir to that name. So its an easy way to see of the map is
928 * unique or not.
929 */
930 if (!strncmp (op->contr->maplevel, settings.localdir, strlen (settings.localdir)))
931 flags = MAP_PLAYER_UNIQUE;
932
933 /* newmap returns the map (if already loaded), or loads it for
934 * us.
935 */
936 newmap = ready_map_name (op->contr->maplevel, flags);
937 if (!newmap)
938 {
939 LOG (llevError, "enter_exit: Pathname to map does not exist! (%s)\n", op->contr->maplevel);
940 newmap = ready_map_name (settings.emergency_mapname, 0);
941 op->x = settings.emergency_x;
942 op->y = settings.emergency_y;
943 /* If we can't load the emergency map, something is probably really
944 * screwed up, so bail out now.
945 */
946 if (!newmap)
947 {
948 LOG (llevError, "enter_exit: could not load emergency map? Fatal error\n");
949 abort ();
950 }
951 }
952 enter_map (op, newmap, op->x, op->y);
953 }
954}
955
956/*
957 * process_active_maps(): Works like process_events(), but it only
958 * processes maps which a player is on.
959 *
960 */
961
962#if 0 // dead code, schmorp
963void
964process_active_maps ()
965{
966 for (maptile *map = first_map; map != NULL; map = map->next)
967 if (map->in_memory == MAP_IN_MEMORY)
968 if (players_on_map (map, TRUE))
969 process_events (map);
970}
971#endif
972
973/* process_players1 and process_players2 do all the player related stuff. 292/* process_players1 and process_players2 do all the player related stuff.
974 * I moved it out of process events and process_map. This was to some 293 * I moved it out of process events and process_map. This was to some
975 * extent for debugging as well as to get a better idea of the time used 294 * extent for debugging as well as to get a better idea of the time used
976 * by the various functions. process_players1() does the processing before 295 * by the various functions. process_players1() does the processing before
977 * objects have been updated, process_players2() does the processing that 296 * objects have been updated, process_players2() does the processing that
978 * is needed after the players have been updated. 297 * is needed after the players have been updated.
979 */ 298 */
980 299static void
981void
982process_players1 (maptile *map) 300process_players1 ()
983{ 301{
984 int flag; 302 int flag;
985 player *pl, *plnext;
986 303
987 /* Basically, we keep looping until all the players have done their actions. */ 304 /* Basically, we keep looping until all the players have done their actions. */
988 for (flag = 1; flag != 0;) 305 for (flag = 1; flag != 0;)
989 { 306 {
990 flag = 0; 307 flag = 0;
991 for (pl = first_player; pl != NULL; pl = plnext) 308 for_all_players (pl)
992 { 309 {
993 plnext = pl->next; /* In case a player exits the game in handle_player() */ 310 pl->refcnt_chk ();
994 311
995 if (pl->ob == NULL) 312 if (!pl->ob || !pl->ns)
996 continue; 313 continue;
997 314
998 if (map != NULL && pl->ob->map != map)
999 continue;
1000
1001 if (pl->ob->speed_left > 0) 315 if (pl->ob->speed_left > 0)
1002 {
1003 if (handle_newcs_player (pl->ob)) 316 if (handle_newcs_player (pl->ob))
1004 flag = 1; 317 flag = 1;
1005 } /* end if player has speed left */
1006 318
1007 /* If the player is not actively playing, don't make a 319 /* If the player is not actively playing, don't make a
1008 * backup save - nothing to save anyway. Plus, the 320 * backup save - nothing to save anyway. Plus, the
1009 * map may not longer be valid. This can happen when the 321 * map may not longer be valid. This can happen when the
1010 * player quits - they exist for purposes of tracking on the map, 322 * player quits - they exist for purposes of tracking on the map,
… …
1015 327
1016#ifdef AUTOSAVE 328#ifdef AUTOSAVE
1017 /* check for ST_PLAYING state so that we don't try to save off when 329 /* check for ST_PLAYING state so that we don't try to save off when
1018 * the player is logging in. 330 * the player is logging in.
1019 */ 331 */
1020 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->state == ST_PLAYING) 332 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
1021 { 333 {
1022 /* Don't save the player on unholy ground. Instead, increase the 334 pl->ob->contr->save ();
1023 * tick time so it will be about 10 seconds before we try and save
1024 * again.
1025 */
1026// if (get_map_flags(pl->ob->map, NULL, pl->ob->x, pl->ob->y, NULL, NULL) & P_NO_CLERIC) {
1027// pl->last_save_tick += 100;
1028// } else {
1029 save_player (pl->ob, 1);
1030 pl->last_save_tick = pticks; 335 pl->last_save_tick = pticks;
1031// }
1032 } 336 }
1033#endif 337#endif
1034 } /* end of for loop for all the players */ 338 } /* end of for loop for all the players */
1035 } /* for flag */ 339 } /* for flag */
1036 for (pl = first_player; pl != NULL; pl = pl->next) 340
341 for_all_players (pl)
1037 { 342 {
1038 if (map != NULL && (pl->ob == NULL || pl->ob->map != map)) 343 if (!pl->ob || !pl->ns)
1039 continue; 344 continue;
345
1040 if (settings.casting_time == TRUE) 346 if (settings.casting_time)
1041 { 347 {
1042 if (pl->ob->casting_time > 0) 348 if (pl->ob->casting_time > 0)
1043 { 349 {
1044 pl->ob->casting_time--; 350 pl->ob->casting_time--;
1045 pl->ob->start_holding = 1; 351 pl->ob->start_holding = 1;
1046 } 352 }
353
1047 /* set spell_state so we can update the range in stats field */ 354 /* set spell_state so we can update the range in stats field */
1048 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1)) 355 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
1049 {
1050 pl->ob->start_holding = 0; 356 pl->ob->start_holding = 0;
1051 } 357 }
1052 } 358
1053 do_some_living (pl->ob); 359 do_some_living (pl->ob);
1054 /* draw(pl->ob); *//* updated in socket code */
1055 } 360 }
1056} 361}
1057 362
1058void 363static void
1059process_players2 (maptile *map) 364process_players2 ()
1060{ 365{
1061 player *pl;
1062
1063 /* Then check if any players should use weapon-speed instead of speed */ 366 /* Then check if any players should use weapon-speed instead of speed */
1064 for (pl = first_player; pl != NULL; pl = pl->next) 367 for_all_players (pl)
1065 { 368 {
1066 if (map != NULL)
1067 {
1068 if (pl->ob == NULL || QUERY_FLAG (pl->ob, FLAG_REMOVED))
1069 continue;
1070 else if (pl->loading != NULL) /* Player is blocked */
1071 pl->ob->speed_left -= pl->ob->speed;
1072 if (pl->ob->map != map)
1073 continue;
1074 }
1075
1076 /* The code that did weapon_sp handling here was out of place - 369 /* The code that did weapon_sp handling here was out of place -
1077 * this isn't called until after the player has finished there 370 * this isn't called until after the player has finished there
1078 * actions, and is thus out of place. All we do here is bounds 371 * actions, and is thus out of place. All we do here is bounds
1079 * checking. 372 * checking.
1080 */ 373 */
… …
1086 /* This needs to be here - if the player is running, we need to 379 /* This needs to be here - if the player is running, we need to
1087 * clear this each tick, but new commands are not being received 380 * clear this each tick, but new commands are not being received
1088 * so execute_newserver_command() is never called 381 * so execute_newserver_command() is never called
1089 */ 382 */
1090 pl->has_hit = 0; 383 pl->has_hit = 0;
1091
1092 } 384 }
1093 else if (pl->ob->speed_left > pl->ob->speed) 385 else if (pl->ob->speed_left > pl->ob->speed)
1094 pl->ob->speed_left = pl->ob->speed; 386 pl->ob->speed_left = pl->ob->speed;
1095 } 387 }
1096} 388}
1097 389
1098void 390void
1099process_events (maptile *map) 391process_events ()
1100{ 392{
1101 object *op; 393 object *op;
1102 394
1103 static object *marker; 395 static object_ptr marker_;
396
1104 if (!marker) 397 if (!marker_)
1105 marker = get_object (); 398 marker_ = object::create ();
1106 399
400 object *marker = marker_;
401
1107 process_players1 (map); 402 process_players1 ();
1108 403
1109 marker->active_next = active_objects; 404 marker->active_next = active_objects;
1110 405
1111 if (marker->active_next) 406 if (marker->active_next)
1112 marker->active_next->active_prev = marker; 407 marker->active_next->active_prev = marker;
1113 408
1114 marker->active_prev = NULL; 409 marker->active_prev = 0;
1115 active_objects = marker; 410 active_objects = marker;
1116 411
1117 while (marker->active_next) 412 while (marker->active_next)
1118 { 413 {
1119 op = marker->active_next; 414 op = marker->active_next;
… …
1136 431
1137 /* Now process op */ 432 /* Now process op */
1138 if (QUERY_FLAG (op, FLAG_FREED)) 433 if (QUERY_FLAG (op, FLAG_FREED))
1139 { 434 {
1140 LOG (llevError, "BUG: process_events(): Free object on list\n"); 435 LOG (llevError, "BUG: process_events(): Free object on list\n");
1141 op->speed = 0; 436 op->set_speed (0);
1142 update_ob_speed (op);
1143 continue; 437 continue;
1144 } 438 }
1145 439
1146 /* I've seen occasional crashes due to this - the object is removed, 440 /* I've seen occasional crashes due to this - the object is removed,
1147 * and thus the map it points to (last map it was on) may be bogus 441 * and thus the map it points to (last map it was on) may be bogus
… …
1154 * around. 448 * around.
1155 */ 449 */
1156 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY) 450 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
1157 { 451 {
1158 LOG (llevError, "BUG: process_events(): Removed object on list\n"); 452 LOG (llevError, "BUG: process_events(): Removed object on list\n");
1159 dump_object (op); 453 char *dump = dump_object (op);
1160 LOG (llevError, errmsg); 454 LOG (llevError, dump);
1161 free_object (op); 455 free (dump);
456 op->destroy ();
1162 continue; 457 continue;
1163 } 458 }
1164 459
1165 if (!op->speed) 460 if (!op->speed)
1166 { 461 {
1167 LOG (llevError, "BUG: process_events(): Object %s has no speed, " "but is on active list\n", &op->arch->name); 462 LOG (llevError, "BUG: process_events(): Object %s has no speed, "
1168 update_ob_speed (op); 463 "but is on active list\n", &op->arch->name);
464 op->set_speed (0);
1169 continue; 465 continue;
1170 } 466 }
1171 467
1172 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP && map == NULL) 468 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP)
1173 { 469 {
1174 LOG (llevError, "BUG: process_events(): Object without map or " "inventory is on active list: %s (%d)\n", &op->name, op->count); 470 LOG (llevError, "BUG: process_events(): Object without map or "
471 "inventory is on active list: %s (%d)\n", &op->name, op->count);
1175 op->speed = 0; 472 op->set_speed (0);
1176 update_ob_speed (op);
1177 continue; 473 continue;
1178 } 474 }
1179 475
1180 if (map != NULL && op->map != map)
1181 continue;
1182
1183 /* Animate the object. Bug of feature that andim_speed 476 /* Animate the object. Bug or feature that anim_speed
1184 * is based on ticks, and not the creatures speed? 477 * is based on ticks, and not the creatures speed?
1185 */ 478 */
1186 if (op->anim_speed && op->last_anim >= op->anim_speed) 479 if (op->anim_speed && op->last_anim >= op->anim_speed)
1187 { 480 {
1188 if ((op->type == PLAYER) || (op->type == MONSTER)) 481 if ((op->type == PLAYER))
1189 animate_object (op, op->facing); 482 animate_object (op, op->facing);
1190 else 483 else
1191 animate_object (op, op->direction); 484 animate_object (op, op->direction);
1192 485
1193 op->last_anim = 1; 486 op->last_anim = 1;
… …
1229 if (marker->active_prev != NULL) 522 if (marker->active_prev != NULL)
1230 marker->active_prev->active_next = NULL; 523 marker->active_prev->active_next = NULL;
1231 else 524 else
1232 active_objects = NULL; 525 active_objects = NULL;
1233 526
1234 process_players2 (map); 527 process_players2 ();
1235} 528}
1236 529
530/* clean up everything before exiting */
1237void 531void
1238clean_tmp_files (void) 532emergency_save ()
1239{ 533{
1240 maptile *m, *next; 534 LOG (llevDebug, "emergency save begin.\n");
1241 535
1242 LOG (llevInfo, "Cleaning up...\n"); 536 LOG (llevDebug, "saving players.\n");
537 for_all_players (pl)
538 pl->save (1);
1243 539
1244 /* We save the maps - it may not be intuitive why, but if there are unique 540// for_all_players (pl)
1245 * items, we need to save the map so they get saved off. Perhaps we should 541// if (pl->ob)
1246 * just make a special function that only saves the unique items. 542// pl->ob->remove ();
1247 */ 543
1248 for (m = first_map; m != NULL; m = next) 544 LOG (llevDebug, "saving maps.\n");
545 maptile::emergency_save ();
546
547 LOG (llevDebug, "saving book archive.\n");
548 write_book_archive ();
549
550 LOG (llevDebug, "emergency save done.\n");
551}
552
553/* clean up everything before exiting */
554void
555cleanup (bool make_core)
556{
557 LOG (llevDebug, "cleanup begin.\n");
558
559 in_cleanup = true;
560
561 if (init_done)
562 emergency_save ();
563
564 LOG (llevDebug, "running cleanup handlers.\n");
565 INVOKE_GLOBAL (CLEANUP);
566
567 LOG (llevDebug, "cleanup done.\n");
568
569 if (make_core)
570 abort ();
571 else
572 _exit (0);
573}
574
575void
576leave (player *pl, int draw_exit)
577{
578 if (pl)
1249 { 579 {
1250 next = m->next; 580 if (pl->ob->type != DEAD_OBJECT)
1251 if (m->in_memory == MAP_IN_MEMORY)
1252 { 581 {
1253 /* If we want to reuse the temp maps, swap it out (note that will also 582 /* If a hidden dm dropped connection do not create
1254 * update the log file. Otherwise, save the map (mostly for unique item 583 * inconsistencies by showing that they have left the game
1255 * stuff). Note that the clean_tmp_map is called after the end of
1256 * the for loop but is in the #else bracket. IF we are recycling the maps,
1257 * we certainly don't want the temp maps removed.
1258 */ 584 */
1259 585 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
1260 /* XXX The above comment is dead wrong */ 586 && draw_exit)
1261 if (settings.recycle_tmp_maps == TRUE)
1262 swap_map (m);
1263 else
1264 { 587 {
1265 new_save_map (m, 0); /* note we save here into a overlay map */ 588 if (pl->ob->map)
1266 clean_tmp_map (m); 589 {
590 INVOKE_PLAYER (LOGOUT, pl);
591 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
592 }
593
594 char buf[MAX_BUF];
595
596 sprintf (buf, "%s left the game.", &pl->ob->name);
597 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
1267 } 598 }
1268 }
1269 }
1270 write_todclock (); /* lets just write the clock here */
1271}
1272 599
1273/* clean up everything before exiting */ 600 pl->ob->remove ();
1274void 601 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
1275cleanup (void) 602 }
1276{
1277 LOG (llevDebug, "Cleanup called.\n");
1278 603
1279 for (player *pl = first_player; pl != NULL; pl = pl->next)
1280 save_player (pl->ob, 0);
1281
1282 for (player *pl = first_player; pl != NULL; pl = pl->next)
1283 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
1284 leave_map (pl->ob);
1285
1286 clean_tmp_files ();
1287 write_book_archive ();
1288
1289 INVOKE_GLOBAL (CLEANUP);
1290
1291 _exit (0);
1292}
1293
1294void
1295leave (player *pl, int draw_exit)
1296{
1297 if (pl != NULL)
1298 {
1299 /* We do this so that the socket handling routine can do the final 604 /* We do this so that the socket handling routine can do the final
1300 * cleanup. We also leave that loop to actually handle the freeing 605 * cleanup. We also leave that loop to actually handle the freeing
1301 * of the data. 606 * of the data.
1302 */ 607 */
1303 if (pl->ob->type != DEAD_OBJECT) 608 if (pl->ns)
1304 { 609 pl->ns->destroy ();
1305 pl->socket.status = Ns_Dead;
1306 610
1307 /* If a hidden dm dropped connection do not create
1308 * inconsistencies by showing that they have left the game
1309 */
1310 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
1311 && draw_exit && (pl->state != ST_GET_NAME && pl->state != ST_GET_PASSWORD && pl->state != ST_CONFIRM_PASSWORD))
1312 {
1313 if (pl->ob->map)
1314 {
1315 INVOKE_PLAYER (LOGOUT, pl);
1316 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->socket.host);
1317 }
1318
1319 char buf[MAX_BUF];
1320
1321 sprintf (buf, "%s left the game.", &pl->ob->name);
1322 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, buf);
1323 }
1324
1325 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
1326 leave_map (pl->ob);
1327
1328 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
1329 }
1330 } 611 }
1331} 612}
1332 613
1333int 614int
1334forbid_play (void) 615forbid_play (void)
… …
1397extern unsigned long todtick; 678extern unsigned long todtick;
1398 679
1399void 680void
1400do_specials (void) 681do_specials (void)
1401{ 682{
1402
1403#ifdef WATCHDOG
1404 if (!(pticks % 503))
1405 watchdog ();
1406#endif
1407
1408 if (!(pticks % PTICKS_PER_CLOCK)) 683 if (!(pticks % PTICKS_PER_CLOCK))
1409 tick_the_clock (); 684 tick_the_clock ();
1410 685
1411 if (!(pticks % 7)) 686 if (!(pticks % 7))
1412 shstr::gc (); 687 shstr::gc ();
1413 688
1414 if (!(pticks % 79))
1415 flush_old_maps (); /* Clears the tmp-files of maps which have reset */
1416
1417 if (!(pticks % 2503)) 689 if (!(pticks % 2503))
1418 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 690 fix_weight (); /* Hack to fix weightproblems caused by bugs */
1419 691
1420 if (!(pticks % 2521))
1421 metaserver_update (); /* 2500 ticks is about 5 minutes */
1422
1423 if (!(pticks % 5003)) 692 if (!(pticks % 5003))
1424 write_book_archive (); 693 write_book_archive ();
1425 694
1426 if (!(pticks % 5009)) 695 if (!(pticks % 5009))
1427 clean_friendly_list (); 696 clean_friendly_list ();
… …
1434} 703}
1435 704
1436void 705void
1437server_tick () 706server_tick ()
1438{ 707{
1439 nroferrors = 0; 708 // first do the user visible stuff
1440
1441 doeric_server (); 709 doeric_server ();
1442 INVOKE_GLOBAL (CLOCK); 710 INVOKE_GLOBAL (CLOCK);
1443 process_events (NULL); /* "do" something with objects with speed */ 711 process_events (); /* "do" something with objects with speed */
1444 flush_sockets (); 712 flush_sockets ();
1445 check_active_maps (); /* Removes unused maps after a certain timeout */ 713
714 // then do some bookkeeping, should not really be here
1446 do_specials (); /* Routines called from time to time. */ 715 do_specials (); /* Routines called from time to time. */
1447 object::free_mortals (); 716 attachable::check_mortals ();
1448 717
1449 ++pticks; 718 ++pticks;
1450} 719}
1451 720
1452int 721int
1453main (int argc, char **argv) 722main (int argc, char **argv)
1454{ 723{
1455 settings.argc = argc; 724 settings.argc = argc;
1456 settings.argv = argv; 725 settings.argv = argv;
1457 726
1458 cfperl_init ();
1459
1460 init (argc, argv); 727 init (argc, argv);
1461 728
1462 initPlugins (); 729 initPlugins ();
1463 730
1464 for (;;) 731 for (;;)
1465 cfperl_main (); 732 cfperl_main ();
1466 733
1467 // unreached 734 // unreached
1468 emergency_save (0);
1469 cleanup (); 735 cleanup ();
1470 736
1471 return 0; 737 return 0;
1472} 738}

Diff Legend

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