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.13 by root, Tue Aug 29 07:34:00 2006 UTC vs.
Revision 1.63 by root, Sat Dec 30 16:56:16 2006 UTC

1/*
2 * static char *rcsid_main_c =
3 * "$Id: main.C,v 1.13 2006/08/29 07:34:00 root Exp $";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
9 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
21 16
22 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 20
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
27*/ 22*/
28 23
29#include <global.h> 24#include <global.h>
30#include <object.h> 25#include <object.h>
31#include <tod.h> 26#include <tod.h>
32 27
33#ifdef HAVE_DES_H 28#ifdef HAVE_DES_H
34#include <des.h> 29# include <des.h>
35#else 30#else
36# ifdef HAVE_CRYPT_H 31# ifdef HAVE_CRYPT_H
37# include <crypt.h> 32# include <crypt.h>
38# endif 33# endif
39#endif 34#endif
40 35
41#ifndef __CEXTRACT__
42#include <sproto.h> 36#include <sproto.h>
43#endif
44
45#ifdef HAVE_TIME_H
46#include <time.h> 37#include <time.h>
47#endif
48 38
49#include <../random_maps/random_map.h> 39#include <../random_maps/random_map.h>
50#include <../random_maps/rproto.h> 40#include <../random_maps/rproto.h>
51#include "path.h" 41#include "path.h"
52 42
53static char days[7][4] = { 43static char days[7][4] = {
54 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; 44 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
45};
55 46
47void
56void version(object *op) { 48version (object *op)
49{
57 if(op!=NULL) 50 if (op != NULL)
58 clear_win_info(op); 51 clear_win_info (op);
59 52
60 new_draw_info_format(NDI_UNIQUE, 0, op, "This is Crossfire v%s",VERSION); 53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire v%s", VERSION);
61 54
62/* 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
63 * crossclient program. 56 * crossclient program.
64 */ 57 */
65 if (op==NULL) return; 58 if (op == NULL)
59 return;
60
66 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>");
67 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>");
68 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>");
69 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>");
70 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>");
71 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>");
72 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>");
73 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>");
74 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>");
75 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>");
76 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>");
77 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>");
78 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>");
79 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>");
80 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>");
81 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>");
82 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>");
83 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>");
84 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>");
85 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>");
86 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>");
87 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>");
88 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>");
89 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>");
90 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>");
91 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>");
92 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>");
93 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>");
94 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>");
95 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>");
96 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>");
97 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>");
98 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>");
99 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>");
100 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>");
101 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>");
102 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>");
103 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>");
104 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>");
105 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>");
106 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
107 new_draw_info(NDI_UNIQUE, 0,op,"Images and art:"); 106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
108 new_draw_info(NDI_UNIQUE, 0,op,"Peter Gardner"); 107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
109 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>");
110 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>");
111 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>");
112 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>");
113 new_draw_info(NDI_UNIQUE, 0,op,"And many more!"); 112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
114}
115
116void info_keys(object *op) {
117 clear_win_info(op);
118 new_draw_info(NDI_UNIQUE, 0,op,"Push `hjklynub' to walk in a direction.");
119 new_draw_info(NDI_UNIQUE, 0,op,"Shift + dir = fire, Ctrl + dir = run");
120 new_draw_info(NDI_UNIQUE, 0,op,"(To fire at yourself, hit `.'");
121 new_draw_info(NDI_UNIQUE, 0,op,"To attack, walk into the monsters.");
122 new_draw_info(NDI_UNIQUE, 0,op,"\" = speak ' = extended command");
123 new_draw_info(NDI_UNIQUE, 0,op,"i = inventory , = get : = look");
124 new_draw_info(NDI_UNIQUE, 0,op,"<> = rotate d = drop ? = help");
125 new_draw_info(NDI_UNIQUE, 0,op,"a = apply A = apply below t = throw");
126 new_draw_info(NDI_UNIQUE, 0,op,"e = examine E = exa below @ = autopick");
127 new_draw_info(NDI_UNIQUE, 0,op,"C = configure s = brace v = version");
128 new_draw_info(NDI_UNIQUE, 0,op,"+- = change range <tab> = browse spells");
129 new_draw_info(NDI_UNIQUE, 0,op,"x = change inventory type");
130 new_draw_info(NDI_UNIQUE, 0,op,"Mouse: L = examine, M = apply, R = drop/get");
131 new_draw_info(NDI_UNIQUE, 0,op,"'help = info about extended commands.");
132 new_draw_info(NDI_UNIQUE, 0,op,"Ctrl-R = refresh Ctrl-C = clear");
133 new_draw_info(NDI_UNIQUE, 0,op,"You can type a number before most commands.");
134 new_draw_info(NDI_UNIQUE, 0,op,"(For instance 3d drops 3 items.)");
135}
136
137void start_info(object *op) {
138 char buf[MAX_BUF];
139
140 sprintf(buf,"Welcome to Crossfire, v%s!",VERSION);
141 new_draw_info(NDI_UNIQUE, 0,op,buf);
142 new_draw_info(NDI_UNIQUE, 0,op,"Press `?' for help");
143 new_draw_info(NDI_UNIQUE, 0,op," ");
144 new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, op,
145 "%s entered the game.",op->name);
146 if(!op->contr->name_changed) {
147 new_draw_info(NDI_UNIQUE, 0,op,"Note that you must set your name with the name");
148 new_draw_info(NDI_UNIQUE, 0,op,"command to enter the highscore list.");
149 new_draw_info(NDI_UNIQUE, 0,op,"(You can also use the crossfire.name X-resource.)");
150 }
151}
152
153/* Really, there is no reason to crypt the passwords any system. But easier
154 * to just leave this enabled for backward compatibility. Put the
155 * simple case at top - no encryption - makes it easier to read.
156 */
157char *crypt_string(char *str, char *salt) {
158#if defined(WIN32) || (defined(__FreeBSD__) && !defined(HAVE_LIBDES))
159 return(str);
160#else
161 static char *c=
162 "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
163 char s[2];
164
165 if(salt==NULL)
166 s[0]= c[RANDOM() % (int)strlen(c)],
167 s[1]= c[RANDOM() % (int)strlen(c)];
168 else
169 s[0]= salt[0],
170 s[1]= salt[1];
171
172# ifdef HAVE_LIBDES
173 return (char*)des_crypt(str,s);
174# endif
175 /* Default case - just use crypt */
176 return (char*)crypt(str,s);
177#endif
178}
179
180int check_password(char *typed,char *crypted) {
181 return !strcmp(crypt_string(typed,crypted),crypted);
182} 113}
183 114
184/* 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
185 * savebed. We do some error checking - its possible that the 116 * savebed. We do some error checking - its possible that the
186 * 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
187 * goes someplace. 118 * goes someplace.
188 */ 119 */
120void
189void enter_player_savebed(object *op) 121enter_player_savebed (object *op)
190{ 122{
191 mapstruct *oldmap = op->map; 123 object *tmp = object::create ();
192 object *tmp;
193
194 tmp=get_object();
195
196 EXIT_PATH(tmp) = add_string(op->contr->savebed_map); 124 EXIT_PATH (tmp) = op->contr->savebed_map;
197 EXIT_X(tmp) = op->contr->bed_x; 125 EXIT_X (tmp) = op->contr->bed_x;
198 EXIT_Y(tmp) = op->contr->bed_y; 126 EXIT_Y (tmp) = op->contr->bed_y;
199 enter_exit(op,tmp); 127 op->enter_exit (tmp);
200 /* If the player has not changed maps and the name does not match 128 tmp->destroy ();
201 * that of the savebed, his savebed map is gone. Lets go back
202 * to the emergency path. Update what the players savebed is
203 * while we're at it.
204 */
205 if (oldmap == op->map && strcmp(op->contr->savebed_map, oldmap->path)) {
206 LOG(llevDebug,"Player %s savebed location %s is invalid - going to emergency location (%s)\n",
207 settings.emergency_mapname, op->name, op->contr->savebed_map);
208 strcpy(op->contr->savebed_map, settings.emergency_mapname);
209 op->contr->bed_x = settings.emergency_x;
210 op->contr->bed_y = settings.emergency_y;
211 free_string(op->contr->savebed_map);
212 EXIT_PATH(tmp) = add_string(op->contr->savebed_map);
213 EXIT_X(tmp) = op->contr->bed_x;
214 EXIT_Y(tmp) = op->contr->bed_y;
215 enter_exit(op,tmp);
216 }
217 free_object(tmp);
218}
219
220/* All this really is is a glorified remove_object that also updates
221 * the counts on the map if needed.
222 */
223void leave_map(object *op)
224{
225 mapstruct *oldmap = op->map;
226
227 remove_ob(op);
228
229 if (oldmap) {
230 if (!op->contr->hidden)
231 oldmap->players--;
232 if (oldmap->players <= 0) { /* can be less than zero due to errors in tracking this */
233 set_map_timeout(oldmap);
234 }
235 }
236} 129}
237 130
238/* 131/*
239 * 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
240 * 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
241 * 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
242 * whatever reason. If default map coordinates are to be used, then 135 * whatever reason. If default map coordinates are to be used, then
243 * the function that calls this should figure them out. 136 * the function that calls this should figure them out.
244 */ 137 */
245static void enter_map(object *op, mapstruct *newmap, int x, int y) { 138void
246 mapstruct *oldmap = op->map; 139object::enter_map (maptile *newmap, int x, int y)
140{
141 if (!newmap->load ())
142 return;
247 143
144 if (out_of_map (newmap, x, y))
145 {
146 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
147 x = newmap->enter_x;
148 y = newmap->enter_y;
248 if (out_of_map(newmap, x, y)) { 149 if (out_of_map (newmap, x, y))
249 LOG(llevError,"enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", 150 {
250 newmap->path, x, y);
251 x=MAP_ENTER_X(newmap);
252 y=MAP_ENTER_Y(newmap);
253 if (out_of_map(newmap, x, y)) {
254 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",
255 newmap->path, x, y, MAP_WIDTH(newmap), MAP_HEIGHT(newmap)); 152 &newmap->path, x, y, newmap->width, newmap->height);
256 new_draw_info(NDI_UNIQUE, 0, op, "The exit is closed"); 153 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
257 return; 154 return;
258 } 155 }
259 } 156 }
157
260 /* try to find a spot for the player */ 158 /* try to find a spot for the player */
261 if (ob_blocked(op, newmap, x, y)) { /* First choice blocked */ 159 if (ob_blocked (this, newmap, x, y))
160 { /* First choice blocked */
262 /* 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.
263 * 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,
264 * 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
265 * if other spaces around are available. 164 * if other spaces around are available.
266 * 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
267 * 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.
268 */ 167 */
269 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);
270 if (i==-1) { 169
170 if (i == -1)
171 {
271 i = find_free_spot(op,newmap, x, y, 1, SIZEOFFREE2+1); 172 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
272 if (i==-1) 173 if (i == -1)
273 i = find_free_spot(op,newmap, x, y, 1, SIZEOFFREE); 174 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
274 } 175 }
275 if (i != -1 ) { 176
177 if (i != -1)
178 {
276 x += freearr_x[i]; 179 x += freearr_x[i];
277 y += freearr_y[i]; 180 y += freearr_y[i];
278 } else { 181 }
182 else
279 /* not much we can do in this case. */ 183 /* not much we can do in this case. */
280 LOG(llevInfo,"enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", 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);
281 newmap->path, x , y); 185 }
282 } 186
283 } /* end if looking for free spot */ 187 if (map)
284
285 if (op->map!=NULL)
286 {
287 INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (op->map), ARG_MAP (newmap));
288 INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr)); 188 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
289 } 189 return;
290 190
191 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
192 return;
193
194 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
195 return;
196
291 /* 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.
292 * otherwise, we need to deal with removing the player here. 198 * otherwise, we need to deal with removing the player here.
293 */ 199 */
294 if(!QUERY_FLAG(op, FLAG_REMOVED)) 200 remove ();
295 remove_ob(op);
296 201
297 /* remove_ob clears these so they must be reset after the remove_ob call */ 202 this->x = x;
298 op->x = x; 203 this->y = y;
299 op->y = y;
300 op->map = newmap; 204 map = newmap;
205
301 insert_ob_in_map(op,op->map,NULL,INS_NO_WALK_ON); 206 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
302 207
303 INVOKE_MAP (ENTER, op->map, ARG_PLAYER (op->contr));
304
305 if (!op->contr->hidden)
306 newmap->players++;
307
308 newmap->timeout=0; 208 newmap->timeout = 0;
309 op->enemy = NULL; 209 enemy = NULL;
310 210
311 if (op->contr) { 211 if (contr)
212 {
312 strcpy(op->contr->maplevel, newmap->path); 213 strcpy (contr->maplevel, newmap->path);
313 op->contr->count=0; 214 contr->count = 0;
314 } 215 }
315 216
316 /* Update any golems */ 217 /* Update any golems */
317 if(op->type == PLAYER && op->contr->ranges[range_golem] != NULL) { 218 if (type == PLAYER && contr->ranges[range_golem])
219 {
318 int i = find_free_spot(op->contr->ranges[range_golem],newmap, 220 int i = find_free_spot (contr->ranges[range_golem], newmap,
319 x, y, 1, SIZEOFFREE); 221 x, y, 1, SIZEOFFREE);
320 remove_ob(op->contr->ranges[range_golem]); 222
321 if (i==-1) { 223 contr->ranges[range_golem]->remove ();
224
225 if (i == -1)
226 {
322 remove_friendly_object(op->contr->ranges[range_golem]); 227 remove_friendly_object (contr->ranges[range_golem]);
323 free_object(op->contr->ranges[range_golem]); 228 contr->ranges[range_golem]->destroy ();
324 op->contr->ranges[range_golem]=NULL; 229 contr->ranges[range_golem] = 0;
325 op->contr->golem_count=0; 230 }
326 } 231 else
327 else { 232 {
328 object *tmp;
329 for (tmp=op->contr->ranges[range_golem]; tmp!=NULL; tmp=tmp->more) { 233 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
234 {
330 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);
331 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);
332 tmp->map = newmap; 237 tmp->map = newmap;
333 } 238 }
239
334 insert_ob_in_map(op->contr->ranges[range_golem], newmap, NULL,0); 240 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
335 op->contr->ranges[range_golem]->direction = 241 contr->ranges[range_golem]->direction =
336 find_dir_2(op->x - op->contr->ranges[range_golem]->x, 242 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
337 op->y - op->contr->ranges[range_golem]->y); 243 }
338 }
339 } 244 }
245
340 op->direction=0; 246 direction = 0;
341 247
342 /* 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
343 * about pending objects. 249 * about pending objects.
344 */ 250 */
345 remove_all_pets(newmap); 251 remove_all_pets (newmap);
346
347 /* If the player is changing maps, we need to do some special things
348 * Do this after the player is on the new map - otherwise the force swap of the
349 * old map does not work.
350 */
351 if (oldmap != newmap) {
352 if (oldmap) /* adjust old map */
353 {
354 oldmap->players--;
355
356 if (oldmap->players <= 0) /* can be less than zero due to errors in tracking this */
357 set_map_timeout(oldmap);
358 }
359 }
360 swap_below_max (newmap->path);
361} 252}
362
363void set_map_timeout(mapstruct *oldmap)
364{
365#if MAP_MAXTIMEOUT
366 oldmap->timeout = MAP_TIMEOUT(oldmap);
367 /* Do MINTIMEOUT first, so that MAXTIMEOUT is used if that is
368 * lower than the min value.
369 */
370#if MAP_MINTIMEOUT
371 if (oldmap->timeout < MAP_MINTIMEOUT) {
372 oldmap->timeout = MAP_MINTIMEOUT;
373 }
374#endif
375 if (oldmap->timeout > MAP_MAXTIMEOUT) {
376 oldmap->timeout = MAP_MAXTIMEOUT;
377 }
378#else
379 /* save out the map */
380 swap_map(oldmap);
381#endif /* MAP_MAXTIMEOUT */
382}
383
384 253
385/* clean_path takes a path and replaces all / with _ 254/* clean_path takes a path and replaces all / with _
386 * 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.
387 */ 256 */
257char *
388char *clean_path(const char *file) 258clean_path (const char *file)
389{ 259{
390 static char newpath[MAX_BUF],*cp; 260 static char newpath[MAX_BUF], *cp;
261 assign (newpath, file);
391 262
392 strncpy(newpath, file, MAX_BUF-1);
393 newpath[MAX_BUF-1]='\0';
394 for (cp=newpath; *cp!='\0'; cp++) { 263 for (cp = newpath; *cp != '\0'; cp++)
395 if (*cp=='/') *cp='_'; 264 if (*cp == '/')
396 } 265 *cp = '_';
266
397 return newpath; 267 return newpath;
398} 268}
399
400 269
401/* unclean_path takes a path and replaces all _ with / 270/* unclean_path takes a path and replaces all _ with /
402 * This basically undoes clean path. 271 * This basically undoes clean path.
403 * 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.
404 * 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
405 * are getting passed a string that points to a unique map 274 * are getting passed a string that points to a unique map
406 * path. 275 * path.
407 */ 276 */
277char *
408char *unclean_path(const char *src) 278unclean_path (const char *src)
409{ 279{
410 static char newpath[MAX_BUF],*cp; 280 static char newpath[MAX_BUF], *cp;
411 281
412 cp=strrchr(src, '/'); 282 cp = strrchr (src, '/');
413 if (cp) 283 assign (newpath, cp ? cp + 1 : src);
414 strncpy(newpath, cp+1, MAX_BUF-1);
415 else
416 strncpy(newpath, src, MAX_BUF-1);
417 newpath[MAX_BUF-1]='\0';
418 284
419 for (cp=newpath; *cp!='\0'; cp++) { 285 for (cp = newpath; *cp != '\0'; cp++)
420 if (*cp=='_') *cp='/'; 286 if (*cp == '_')
421 } 287 *cp = '/';
288
422 return newpath; 289 return newpath;
423} 290}
424
425
426/* The player is trying to enter a randomly generated map. In this case, generate the
427 * random map as needed.
428 */
429
430static void enter_random_map(object *pl, object *exit_ob)
431{
432 mapstruct *new_map;
433 char newmap_name[HUGE_BUF], *cp;
434 static int reference_number = 0;
435 RMParms rp;
436
437 memset(&rp, 0, sizeof(RMParms));
438 rp.Xsize=-1;
439 rp.Ysize=-1;
440 rp.region=get_region_by_map(exit_ob->map);
441 if (exit_ob->msg) set_random_map_variable(&rp,exit_ob->msg);
442 rp.origin_x = exit_ob->x;
443 rp.origin_y = exit_ob->y;
444 strcpy(rp.origin_map, pl->map->path);
445
446 /* If we have a final_map, use it as a base name to give some clue
447 * as where the player is. Otherwise, use the origin map.
448 * Take the last component (after the last slash) to give
449 * shorter names without bogus slashes.
450 */
451 if (rp.final_map[0]) {
452 cp = strrchr(rp.final_map, '/');
453 if (!cp) cp = rp.final_map;
454 } else {
455 char buf[HUGE_BUF];
456
457 cp = strrchr(rp.origin_map, '/');
458 if (!cp) cp = rp.origin_map;
459 /* Need to strip of any trailing digits, if it has them */
460 strcpy(buf, cp);
461 while (isdigit(buf[strlen(buf) - 1]))
462 buf[strlen(buf) - 1] = 0;
463 cp = buf;
464 }
465
466 sprintf(newmap_name,"/random/%s%04d",cp+1, reference_number++);
467
468 /* now to generate the actual map. */
469 new_map=generate_random_map(newmap_name,&rp);
470
471 /* Update the exit_ob so it now points directly at the newly created
472 * random maps. Not that it is likely to happen, but it does mean that a
473 * exit in a unique map leading to a random map will not work properly.
474 * It also means that if the created random map gets reset before
475 * the exit leading to it, that the exit will no longer work.
476 */
477 if(new_map) {
478 int x, y;
479 x=EXIT_X(exit_ob) = MAP_ENTER_X(new_map);
480 y=EXIT_Y(exit_ob) = MAP_ENTER_Y(new_map);
481 EXIT_PATH(exit_ob) = add_string(newmap_name);
482 strcpy(new_map->path, newmap_name);
483 enter_map(pl, new_map, x, y);
484 }
485}
486
487/* The player is trying to enter a non-randomly generated template map. In this
488 * case, use a map file for a template
489 */
490
491static void enter_fixed_template_map(object *pl, object *exit_ob)
492{
493 mapstruct *new_map;
494 char tmpnum[32], exitpath[HUGE_BUF], resultname[HUGE_BUF], tmpstring[HUGE_BUF], *sourcemap;
495 const char *new_map_name;
496
497 /* Split the exit path string into two parts, one
498 * for where to store the map, and one for were
499 * to generate the map from.
500 */
501 snprintf(exitpath, sizeof(exitpath), "%s", EXIT_PATH(exit_ob)+2);
502 sourcemap = strchr(exitpath, '!');
503 if (!sourcemap) {
504 new_draw_info_format(NDI_UNIQUE, 0, pl, "The %s is closed.", exit_ob->name);
505 /* Should only occur when no source map is set.
506 */
507 LOG(llevError,"enter_fixed_template_map: Exit %s (%d,%d) on map %s has no source template.\n",
508 exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
509 return;
510 }
511 *sourcemap++ = '\0';
512
513 /* If we are not coming from a template map, we can use relative directories
514 * for the map to generate from.
515 */
516 if (!exit_ob->map->templatemap) {
517 sourcemap = path_combine_and_normalize(exit_ob->map->path, sourcemap);
518 }
519
520 /* Do replacement of %x, %y, and %n to the x coord of the exit, the y coord
521 * of the exit, and the name of the map the exit is on, respectively.
522 */
523 sprintf(tmpnum ,"%d", exit_ob->x);
524 replace(exitpath, "%x", tmpnum, resultname, sizeof(resultname));
525
526 sprintf(tmpnum ,"%d", exit_ob->y);
527 sprintf(tmpstring, "%s", resultname);
528 replace(tmpstring, "%y", tmpnum, resultname, sizeof(resultname));
529
530 sprintf(tmpstring, "%s", resultname);
531 replace(tmpstring, "%n", exit_ob->map->name, resultname, sizeof(resultname));
532
533 /* If we are coming from another template map, use reletive paths unless
534 * indicated otherwise.
535 */
536 if (exit_ob->map->templatemap && (resultname[0] != '/')) {
537 new_map_name = path_combine_and_normalize(exit_ob->map->path, resultname);
538 } else {
539 new_map_name = create_template_pathname(resultname);
540 }
541
542 /* Attempt to load the map, if unable to, then
543 * create the map from the template.
544 */
545 new_map = ready_map_name(new_map_name, MAP_PLAYER_UNIQUE);
546 if (!new_map) {
547 new_map = load_original_map(create_pathname(sourcemap), MAP_PLAYER_UNIQUE);
548 if (new_map) fix_auto_apply(new_map);
549 }
550
551 if (new_map) {
552 /* set the path of the map to where it should be
553 * so we don't just save over the source map.
554 */
555 strcpy(new_map->path, new_map_name);
556 new_map->templatemap = 1;
557 enter_map(pl, new_map, EXIT_X(exit_ob), EXIT_Y(exit_ob));
558 } else {
559 new_draw_info_format(NDI_UNIQUE, 0, pl, "The %s is closed.", exit_ob->name);
560 /* Should only occur when an invalid source map is set.
561 */
562 LOG(llevDebug,"enter_fixed_template_map: Exit %s (%d,%d) on map %s leads no where.\n",
563 exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
564 }
565}
566
567
568/* The player is trying to enter a randomly generated template map. In this
569 * case, generate the map as needed.
570 */
571
572static void enter_random_template_map(object *pl, object *exit_ob)
573{
574 mapstruct *new_map;
575 char tmpnum[32], resultname[HUGE_BUF], tmpstring[HUGE_BUF];
576 const char *new_map_name;
577 RMParms rp;
578
579 /* Do replacement of %x, %y, and %n to the x coord of the exit, the y coord
580 * of the exit, and the name of the map the exit is on, respectively.
581 */
582 sprintf(tmpnum ,"%d", exit_ob->x);
583 replace(EXIT_PATH(exit_ob)+3, "%x", tmpnum, resultname, sizeof(resultname));
584
585 sprintf(tmpnum ,"%d", exit_ob->y);
586 sprintf(tmpstring, "%s", resultname);
587 replace(tmpstring, "%y", tmpnum, resultname, sizeof(resultname));
588
589 sprintf(tmpstring, "%s", resultname);
590 replace(tmpstring, "%n", exit_ob->map->name, resultname, sizeof(resultname));
591
592 /* If we are coming from another template map, use reletive paths unless
593 * indicated otherwise.
594 */
595 if (exit_ob->map->templatemap && (resultname[0] != '/')) {
596 new_map_name = path_combine_and_normalize(exit_ob->map->path, resultname);
597 } else {
598 new_map_name = create_template_pathname(resultname);
599 }
600
601 new_map = ready_map_name(new_map_name, MAP_PLAYER_UNIQUE);
602 if (!new_map) {
603 memset(&rp, 0, sizeof(RMParms));
604 rp.Xsize=-1;
605 rp.Ysize=-1;
606 rp.region=get_region_by_map(exit_ob->map);
607 if (exit_ob->msg) set_random_map_variable(&rp,exit_ob->msg);
608 rp.origin_x = exit_ob->x;
609 rp.origin_y = exit_ob->y;
610 strcpy(rp.origin_map, pl->map->path);
611
612 /* now to generate the actual map. */
613 new_map=generate_random_map(new_map_name,&rp);
614 }
615
616
617 /* Update the exit_ob so it now points directly at the newly created
618 * random maps. Not that it is likely to happen, but it does mean that a
619 * exit in a unique map leading to a random map will not work properly.
620 * It also means that if the created random map gets reset before
621 * the exit leading to it, that the exit will no longer work.
622 */
623 if(new_map) {
624 int x, y;
625 x=EXIT_X(exit_ob) = MAP_ENTER_X(new_map);
626 y=EXIT_Y(exit_ob) = MAP_ENTER_Y(new_map);
627 new_map->templatemap = 1;
628 enter_map(pl, new_map, x, y);
629 }
630}
631
632
633/* Code to enter/detect a character entering a unique map.
634 */
635static void enter_unique_map(object *op, object *exit_ob)
636{
637 char apartment[HUGE_BUF];
638 mapstruct *newmap;
639
640 if (EXIT_PATH(exit_ob)[0]=='/') {
641 sprintf(apartment, "%s/%s/%s/%s", settings.localdir,
642 settings.playerdir, op->name, clean_path(EXIT_PATH(exit_ob)));
643 newmap = ready_map_name(apartment, MAP_PLAYER_UNIQUE);
644 if (!newmap) {
645 newmap = load_original_map(create_pathname(EXIT_PATH(exit_ob)), MAP_PLAYER_UNIQUE);
646 if (newmap) fix_auto_apply(newmap);
647 }
648 } else { /* relative directory */
649 char reldir[HUGE_BUF], tmpc[HUGE_BUF], *cp;
650
651 if (exit_ob->map->unique) {
652
653 strcpy(reldir, unclean_path(exit_ob->map->path));
654
655 /* Need to copy this over, as clean_path only has one static return buffer */
656 strcpy(tmpc, clean_path(reldir));
657 /* Remove final component, if any */
658 if ((cp=strrchr(tmpc, '_'))!=NULL) *cp=0;
659
660 sprintf(apartment, "%s/%s/%s/%s_%s", settings.localdir,
661 settings.playerdir, op->name, tmpc,
662 clean_path(EXIT_PATH(exit_ob)));
663
664 newmap = ready_map_name(apartment, MAP_PLAYER_UNIQUE);
665 if (!newmap) {
666 newmap = load_original_map(create_pathname(path_combine_and_normalize(reldir, EXIT_PATH(exit_ob))), MAP_PLAYER_UNIQUE);
667 if (newmap) fix_auto_apply(newmap);
668 }
669 }
670 else {
671 /* The exit is unique, but the map we are coming from is not unique. So
672 * use the basic logic - don't need to demangle the path name
673 */
674 sprintf(apartment, "%s/%s/%s/%s", settings.localdir,
675 settings.playerdir, op->name,
676 clean_path(path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob))));
677 newmap = ready_map_name(apartment, MAP_PLAYER_UNIQUE);
678 if (!newmap) {
679 newmap = ready_map_name(path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob)), 0);
680 if (newmap) fix_auto_apply(newmap);
681 }
682 }
683 }
684
685 if (newmap) {
686 strcpy(newmap->path, apartment);
687 newmap->unique = 1;
688 enter_map(op, newmap, EXIT_X(exit_ob), EXIT_Y(exit_ob));
689 } else {
690 new_draw_info_format(NDI_UNIQUE, 0, op, "The %s is closed.", exit_ob->name);
691 /* Perhaps not critical, but I would think that the unique maps
692 * should be new enough this does not happen. This also creates
693 * a strange situation where some players could perhaps have visited
694 * such a map before it was removed, so they have the private
695 * map, but other players can't get it anymore.
696 */
697 LOG(llevDebug,"enter_unique_map: Exit %s (%d,%d) on map %s is leads no where.\n",
698 exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
699 }
700
701}
702
703
704/* Tries to move 'op' to exit_ob. op is the character or monster that is
705 * using the exit, where exit_ob is the exit object (boat, door, teleporter,
706 * etc.) if exit_ob is null, then op->contr->maplevel contains that map to
707 * move the object to. This is used when loading the player.
708 *
709 * Largely redone by MSW 2001-01-21 - this function was overly complex
710 * and had some obscure bugs.
711 */
712
713void enter_exit(object *op, object *exit_ob) {
714 #define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */
715 object *tmp;
716 /* It may be nice to support other creatures moving across
717 * exits, but right now a lot of the code looks at op->contr,
718 * so thta is an RFE.
719 */
720 if (op->type != PLAYER) return;
721
722 /* First, lets figure out what map the player is going to go to */
723 if (exit_ob){
724
725 /* check to see if we make a template map */
726 if(EXIT_PATH(exit_ob)&&EXIT_PATH(exit_ob)[1]=='@') {
727 if (EXIT_PATH(exit_ob)[2]=='!') {
728 /* generate a template map randomly */
729 enter_random_template_map(op, exit_ob);
730 } else {
731 /* generate a template map from a fixed template */
732 enter_fixed_template_map(op, exit_ob);
733 }
734 }
735 /* check to see if we make a randomly generated map */
736 else if(EXIT_PATH(exit_ob)&&EXIT_PATH(exit_ob)[1]=='!') {
737 enter_random_map(op, exit_ob);
738 }
739 else if (QUERY_FLAG(exit_ob, FLAG_UNIQUE)) {
740 enter_unique_map(op, exit_ob);
741 } else {
742 int x=EXIT_X(exit_ob), y=EXIT_Y(exit_ob);
743 /* 'Normal' exits that do not do anything special
744 * Simple enough we don't need another routine for it.
745 */
746 mapstruct *newmap;
747 if (exit_ob->map) {
748 newmap = ready_map_name(path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob)), 0);
749 /* Random map was previously generated, but is no longer about. Lets generate a new
750 * map.
751 */
752 if (!newmap && !strncmp(EXIT_PATH(exit_ob),"/random/",8)) {
753 /* Maps that go down have a message set. However, maps that go
754 * up, don't. If the going home has reset, there isn't much
755 * point generating a random map, because it won't match the maps.
756 */
757 if (exit_ob->msg) {
758 enter_random_map(op, exit_ob);
759 } else {
760 new_draw_info_format(NDI_UNIQUE, 0, op, "The %s is closed.", exit_ob->name);
761 return;
762 }
763
764 /* For exits that cause damages (like pits). Don't know if any
765 * random maps use this or not.
766 */
767 if(exit_ob->stats.dam && op->type==PLAYER)
768 hit_player(op,exit_ob->stats.dam,exit_ob,exit_ob->attacktype,1);
769 return;
770 }
771 } else {
772 /* For word of recall and other force objects
773 * They contain the full pathname of the map to go back to,
774 * so we don't need to normalize it.
775 * But we do need to see if it is unique or not
776 */
777 if (!strncmp(EXIT_PATH(exit_ob), settings.localdir, strlen(settings.localdir)))
778 newmap = ready_map_name(EXIT_PATH(exit_ob), MAP_PLAYER_UNIQUE);
779 else
780 newmap = ready_map_name(EXIT_PATH(exit_ob), 0);
781 }
782 if (!newmap)
783 {
784 if (exit_ob->name)
785 new_draw_info_format(NDI_UNIQUE, 0, op, "The %s is closed.", exit_ob->name);
786 /* don't cry to momma if name is not set - as in tmp objects
787 * used by the savebed code and character creation */
788 return;
789 }
790
791 /* This supports the old behaviour, but it really should not be used.
792 * I will note for example that with this method, it is impossible to
793 * set 0,0 destination coordinates. Really, if we want to support
794 * using the new maps default coordinates, the exit ob should use
795 * something like -1, -1 so it is clear to do that.
796 */
797 if (x==0 && y==0) {
798 x=MAP_ENTER_X(newmap);
799 y=MAP_ENTER_Y(newmap);
800 LOG(llevDebug,"enter_exit: Exit %s (%d,%d) on map %s is 0 destination coordinates\n",
801 exit_ob->name?exit_ob->name:"(none)", exit_ob->x, exit_ob->y,
802 exit_ob->map?exit_ob->map->path:"(none)");
803 }
804
805 /* mids 02/13/2002 if exit is damned, update players death & WoR home-position and delete town portal */
806 if (QUERY_FLAG(exit_ob, FLAG_DAMNED)) {
807 /* remove an old force with a slaying field == PORTAL_DESTINATION_NAME */
808 for(tmp=op->inv; tmp != NULL; tmp = tmp->below) {
809 if(tmp->type == FORCE && tmp->slaying && !strcmp(tmp->slaying, PORTAL_DESTINATION_NAME)) break;
810 }
811 if(tmp) {
812 remove_ob(tmp);
813 free_object(tmp);
814 }
815
816 strcpy(op->contr->savebed_map, path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob)));
817 op->contr->bed_x = EXIT_X(exit_ob), op->contr->bed_y = EXIT_Y(exit_ob);
818 save_player(op, 1);
819 /* LOG(llevDebug,"enter_exit: Taking damned exit %s to (%d,%d) on map %s\n",
820 * exit_ob->name?exit_ob->name:"(none)", exit_ob->x, exit_ob->y,
821 * path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob))); */
822 }
823
824 enter_map(op, newmap, x, y);
825 }
826 /* For exits that cause damages (like pits) */
827 if(exit_ob->stats.dam && op->type==PLAYER)
828 hit_player(op,exit_ob->stats.dam,exit_ob,exit_ob->attacktype,1);
829 } else {
830 int flags = 0;
831 mapstruct *newmap;
832
833
834 /* Hypothetically, I guess its possible that a standard map matches
835 * the localdir, but that seems pretty unlikely - unlikely enough that
836 * I'm not going to attempt to try to deal with that possibility.
837 * We use the fact that when a player saves on a unique map, it prepends
838 * the localdir to that name. So its an easy way to see of the map is
839 * unique or not.
840 */
841 if (!strncmp(op->contr->maplevel, settings.localdir, strlen(settings.localdir)))
842 flags = MAP_PLAYER_UNIQUE;
843
844 /* newmap returns the map (if already loaded), or loads it for
845 * us.
846 */
847 newmap = ready_map_name(op->contr->maplevel, flags);
848 if (!newmap)
849 {
850 LOG(llevError,
851 "enter_exit: Pathname to map does not exist! (%s)\n",
852 op->contr->maplevel);
853 newmap = ready_map_name(settings.emergency_mapname, 0);
854 op->x = settings.emergency_x;
855 op->y = settings.emergency_y;
856 /* If we can't load the emergency map, something is probably really
857 * screwed up, so bail out now.
858 */
859 if (!newmap) {
860 LOG(llevError,"enter_exit: could not load emergency map? Fatal error\n");
861 abort();
862 }
863 }
864 enter_map(op, newmap, op->x, op->y);
865 }
866}
867
868/*
869 * process_active_maps(): Works like process_events(), but it only
870 * processes maps which a player is on.
871 *
872 */
873
874#if 0 // dead code, schmorp
875void process_active_maps ()
876{
877 for (mapstruct *map = first_map; map != NULL; map = map->next)
878 if (map->in_memory == MAP_IN_MEMORY)
879 if (players_on_map (map, TRUE))
880 process_events (map);
881}
882#endif
883 291
884/* process_players1 and process_players2 do all the player related stuff. 292/* process_players1 and process_players2 do all the player related stuff.
885 * 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
886 * 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
887 * by the various functions. process_players1() does the processing before 295 * by the various functions. process_players1() does the processing before
888 * objects have been updated, process_players2() does the processing that 296 * objects have been updated, process_players2() does the processing that
889 * is needed after the players have been updated. 297 * is needed after the players have been updated.
890 */ 298 */
891 299static void
892void process_players1(mapstruct *map) 300process_players1 ()
893{ 301{
894 int flag; 302 int flag;
895 player *pl,*plnext;
896 303
897 /* 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. */
898 for(flag=1;flag!=0;) { 305 for (flag = 1; flag != 0;)
899 flag=0; 306 {
900 for(pl=first_player;pl!=NULL;pl=plnext) { 307 flag = 0;
901 plnext=pl->next; /* In case a player exits the game in handle_player() */ 308 for_all_players (pl)
309 {
310 pl->refcnt_chk ();
902 311
903 if (pl->ob == NULL) continue; 312 if (!pl->ob || !pl->ns)
313 continue;
904 314
905 if (map!=NULL && pl->ob->map!=map) continue;
906
907 if(pl->ob->speed_left>0) { 315 if (pl->ob->speed_left > 0)
908 if (handle_newcs_player(pl->ob)) 316 if (handle_newcs_player (pl->ob))
909 flag=1; 317 flag = 1;
910 } /* end if player has speed left */
911 318
912 /* If the player is not actively playing, don't make a 319 /* If the player is not actively playing, don't make a
913 * backup save - nothing to save anyway. Plus, the 320 * backup save - nothing to save anyway. Plus, the
914 * map may not longer be valid. This can happen when the 321 * map may not longer be valid. This can happen when the
915 * player quits - they exist for purposes of tracking on the map, 322 * player quits - they exist for purposes of tracking on the map,
916 * but don't actually reside on any actual map. 323 * but don't actually reside on any actual map.
917 */ 324 */
918 if (QUERY_FLAG(pl->ob, FLAG_REMOVED)) continue; 325 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
326 continue;
919 327
920#ifdef AUTOSAVE 328#ifdef AUTOSAVE
921 /* 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
922 * the player is logging in. 330 * the player is logging in.
923 */ 331 */
924 if ((pl->last_save_tick+AUTOSAVE)<pticks && pl->state==ST_PLAYING) { 332 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
925 /* Don't save the player on unholy ground. Instead, increase the 333 {
926 * tick time so it will be about 10 seconds before we try and save 334 pl->ob->contr->save ();
927 * again.
928 */
929// if (get_map_flags(pl->ob->map, NULL, pl->ob->x, pl->ob->y, NULL, NULL) & P_NO_CLERIC) {
930// pl->last_save_tick += 100;
931// } else {
932 save_player(pl->ob,1);
933 pl->last_save_tick = pticks; 335 pl->last_save_tick = pticks;
934// } 336 }
935 }
936#endif 337#endif
937 } /* end of for loop for all the players */ 338 } /* end of for loop for all the players */
938 } /* for flag */ 339 } /* for flag */
939 for(pl=first_player;pl!=NULL;pl=pl->next) { 340
940 if (map!=NULL && (pl->ob == NULL || pl->ob->map!=map)) 341 for_all_players (pl)
342 {
343 if (!pl->ob || !pl->ns)
941 continue; 344 continue;
345
942 if (settings.casting_time == TRUE) { 346 if (settings.casting_time)
347 {
943 if (pl->ob->casting_time > 0){ 348 if (pl->ob->casting_time > 0)
944 pl->ob->casting_time--; 349 {
350 pl->ob->casting_time--;
945 pl->ob->start_holding = 1; 351 pl->ob->start_holding = 1;
946 } 352 }
353
947 /* 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 */
948 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding ==1)){ 355 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
949 pl->ob->start_holding = 0; 356 pl->ob->start_holding = 0;
357 }
358
359 do_some_living (pl->ob);
950 } 360 }
951 }
952 do_some_living(pl->ob);
953/* draw(pl->ob);*/ /* updated in socket code */
954 }
955} 361}
956 362
957void process_players2(mapstruct *map) 363static void
364process_players2 ()
958{ 365{
959 player *pl;
960
961 /* 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 */
962 for(pl=first_player;pl!=NULL;pl=pl->next) { 367 for_all_players (pl)
963 if (map!=NULL) { 368 {
964 if(pl->ob == NULL || QUERY_FLAG(pl->ob,FLAG_REMOVED))
965 continue;
966 else if(pl->loading != NULL) /* Player is blocked */
967 pl->ob->speed_left -= pl->ob->speed;
968 if (pl->ob->map!=map) continue;
969 }
970
971 /* 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 -
972 * this isn't called until after the player has finished there 370 * this isn't called until after the player has finished there
973 * 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
974 * checking. 372 * checking.
975 */ 373 */
976 if (pl->has_hit) { 374 if (pl->has_hit)
977 if (pl->ob->speed_left > pl->weapon_sp) pl->ob->speed_left = pl->weapon_sp; 375 {
376 if (pl->ob->speed_left > pl->weapon_sp)
377 pl->ob->speed_left = pl->weapon_sp;
978 378
979 /* 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
980 * clear this each tick, but new commands are not being received 380 * clear this each tick, but new commands are not being received
981 * so execute_newserver_command() is never called 381 * so execute_newserver_command() is never called
982 */ 382 */
983 pl->has_hit=0; 383 pl->has_hit = 0;
984 384 }
985 } else if (pl->ob->speed_left>pl->ob->speed) 385 else if (pl->ob->speed_left > pl->ob->speed)
986 pl->ob->speed_left = pl->ob->speed; 386 pl->ob->speed_left = pl->ob->speed;
987 } 387 }
988} 388}
989 389
990#define SPEED_DEBUG 390void
991 391process_events ()
992
993void process_events (mapstruct *map)
994{ 392{
995 object *op; 393 object *op;
996 object marker;
997 tag_t tag;
998 394
395 static object_ptr marker_;
396
397 if (!marker_)
398 marker_ = object::create ();
399
400 object *marker = marker_;
401
999 process_players1 (map); 402 process_players1 ();
1000 403
1001 memset(&marker, 0, sizeof(object));
1002 /* Put marker object at beginning of active list */
1003 marker.active_next = active_objects; 404 marker->active_next = active_objects;
1004 405
1005 if (marker.active_next) 406 if (marker->active_next)
1006 marker.active_next->active_prev = &marker;
1007 marker.active_prev = NULL;
1008 active_objects = &marker;
1009
1010 while (marker.active_next) {
1011 op = marker.active_next;
1012 tag = op->count;
1013
1014 /* Move marker forward - swap op and marker */
1015 op->active_prev = marker.active_prev;
1016
1017 if (op->active_prev)
1018 op->active_prev->active_next = op;
1019 else
1020 active_objects = op;
1021
1022 marker.active_next = op->active_next;
1023
1024 if (marker.active_next)
1025 marker.active_next->active_prev = &marker; 407 marker->active_next->active_prev = marker;
408
1026 marker.active_prev = op; 409 marker->active_prev = 0;
410 active_objects = marker;
411
412 while (marker->active_next)
413 {
414 op = marker->active_next;
415
416 /* Move marker forward - swap op and marker */
417 op->active_prev = marker->active_prev;
418
419 if (op->active_prev)
420 op->active_prev->active_next = op;
421 else
422 active_objects = op;
423
424 marker->active_next = op->active_next;
425
426 if (marker->active_next)
427 marker->active_next->active_prev = marker;
428
429 marker->active_prev = op;
1027 op->active_next = &marker; 430 op->active_next = marker;
1028 431
1029 /* Now process op */ 432 /* Now process op */
1030 if (QUERY_FLAG (op, FLAG_FREED)) { 433 if (QUERY_FLAG (op, FLAG_FREED))
434 {
1031 LOG (llevError, "BUG: process_events(): Free object on list\n"); 435 LOG (llevError, "BUG: process_events(): Free object on list\n");
1032 op->speed = 0; 436 op->set_speed (0);
1033 update_ob_speed (op);
1034 continue; 437 continue;
1035 } 438 }
1036 439
1037 /* 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,
1038 * 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
1039 * The real bug is to try to find out the cause of this - someone 442 * The real bug is to try to find out the cause of this - someone
1040 * is probably calling remove_ob without either an insert_ob or 443 * is probably calling remove_ob without either an insert_ob or
1041 * free_object afterwards, leaving an object dangling. But I'd 444 * free_object afterwards, leaving an object dangling. But I'd
1042 * rather log this and continue on instead of crashing. 445 * rather log this and continue on instead of crashing.
1043 * Don't remove players - when a player quits, the object is in 446 * Don't remove players - when a player quits, the object is in
1044 * sort of a limbo, of removed, but something we want to keep 447 * sort of a limbo, of removed, but something we want to keep
1045 * around. 448 * around.
1046 */ 449 */
1047 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && 450 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
1048 op->map && op->map->in_memory != MAP_IN_MEMORY) { 451 {
1049 LOG (llevError, "BUG: process_events(): Removed object on list\n"); 452 LOG (llevError, "BUG: process_events(): Removed object on list\n");
1050 dump_object(op); 453 char *dump = dump_object (op);
1051 LOG(llevError, errmsg); 454 LOG (llevError, dump);
1052 free_object(op); 455 free (dump);
456 op->destroy ();
1053 continue; 457 continue;
1054 } 458 }
1055 459
1056 if ( ! op->speed) { 460 if (!op->speed)
461 {
1057 LOG (llevError, "BUG: process_events(): Object %s has no speed, " 462 LOG (llevError, "BUG: process_events(): Object %s has no speed, "
1058 "but is on active list\n", op->arch->name); 463 "but is on active list\n", &op->arch->name);
1059 update_ob_speed (op); 464 op->set_speed (0);
1060 continue; 465 continue;
1061 } 466 }
1062 467
1063 if (op->map == NULL && op->env == NULL && op->name && 468 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP)
1064 op->type != MAP && map == NULL) { 469 {
1065 LOG (llevError, "BUG: process_events(): Object without map or " 470 LOG (llevError, "BUG: process_events(): Object without map or "
1066 "inventory is on active list: %s (%d)\n", 471 "inventory is on active list: %s (%d)\n", &op->name, op->count);
1067 op->name, op->count); 472 op->set_speed (0);
1068 op->speed = 0;
1069 update_ob_speed (op);
1070 continue; 473 continue;
1071 } 474 }
1072 475
1073 if (map != NULL && op->map != map)
1074 continue;
1075
1076 /* Animate the object. Bug of feature that andim_speed 476 /* Animate the object. Bug or feature that anim_speed
1077 * is based on ticks, and not the creatures speed? 477 * is based on ticks, and not the creatures speed?
1078 */ 478 */
1079 if (op->anim_speed && op->last_anim >= op->anim_speed) 479 if (op->anim_speed && op->last_anim >= op->anim_speed)
1080 { 480 {
1081 if ((op->type==PLAYER)||(op->type==MONSTER)) 481 if ((op->type == PLAYER))
1082 animate_object(op, op->facing); 482 animate_object (op, op->facing);
1083 else 483 else
1084 animate_object (op, op->direction); 484 animate_object (op, op->direction);
1085 485
1086 op->last_anim = 1; 486 op->last_anim = 1;
1087 } 487 }
1088 else 488 else
1089 op->last_anim++; 489 op->last_anim++;
1090 490
1091 if (op->speed_left > 0) { 491 if (op->speed_left > 0)
492 {
1092#if 0 493#if 0
1093 /* I've seen occasional crashes in move_symptom() with it 494 /* I've seen occasional crashes in move_symptom() with it
1094 * crashing because op is removed - add some debugging to 495 * crashing because op is removed - add some debugging to
1095 * track if it is removed at this point. 496 * track if it is removed at this point.
1096 * This unfortunately is a bit too verbose it seems - not sure 497 * This unfortunately is a bit too verbose it seems - not sure
1097 * why - I think what happens is a map is freed or something and 498 * why - I think what happens is a map is freed or something and
1098 * some objects get 'lost' - removed never to be reclaimed. 499 * some objects get 'lost' - removed never to be reclaimed.
1099 * removed objects generally shouldn't exist. 500 * removed objects generally shouldn't exist.
1100 */ 501 */
1101 if (QUERY_FLAG(op, FLAG_REMOVED)) { 502 if (QUERY_FLAG (op, FLAG_REMOVED))
503 {
1102 LOG(llevDebug,"process_events: calling process_object with removed object %s\n", 504 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
1103 op->name?op->name:"null"); 505 }
1104 }
1105#endif 506#endif
1106 --op->speed_left; 507 --op->speed_left;
1107 process_object (op); 508 process_object (op);
1108 if (was_destroyed (op, tag)) 509
1109 continue; 510 if (op->destroyed ())
1110 } 511 continue;
512 }
513
1111 if (settings.casting_time == TRUE && op->casting_time > 0) 514 if (settings.casting_time == TRUE && op->casting_time > 0)
1112 op->casting_time--; 515 op->casting_time--;
516
1113 if (op->speed_left <= 0) 517 if (op->speed_left <= 0)
1114 op->speed_left += FABS (op->speed); 518 op->speed_left += FABS (op->speed);
1115 } 519 }
1116 520
1117 /* Remove marker object from active list */ 521 /* Remove marker object from active list */
1118 if (marker.active_prev != NULL) 522 if (marker->active_prev != NULL)
1119 marker.active_prev->active_next = NULL; 523 marker->active_prev->active_next = NULL;
1120 else 524 else
1121 active_objects = NULL; 525 active_objects = NULL;
1122 526
1123 process_players2 (map); 527 process_players2 ();
1124}
1125
1126void clean_tmp_files(void) {
1127 mapstruct *m, *next;
1128
1129 LOG(llevInfo,"Cleaning up...\n");
1130
1131 /* We save the maps - it may not be intuitive why, but if there are unique
1132 * items, we need to save the map so they get saved off. Perhaps we should
1133 * just make a special function that only saves the unique items.
1134 */
1135 for(m=first_map;m!=NULL;m=next) {
1136 next=m->next;
1137 if (m->in_memory == MAP_IN_MEMORY) {
1138 /* If we want to reuse the temp maps, swap it out (note that will also
1139 * update the log file. Otherwise, save the map (mostly for unique item
1140 * stuff). Note that the clean_tmp_map is called after the end of
1141 * the for loop but is in the #else bracket. IF we are recycling the maps,
1142 * we certainly don't want the temp maps removed.
1143 */
1144
1145 /* XXX The above comment is dead wrong */
1146 if (settings.recycle_tmp_maps == TRUE)
1147 swap_map(m);
1148 else {
1149 new_save_map(m, 0); /* note we save here into a overlay map */
1150 clean_tmp_map(m);
1151 }
1152 }
1153 }
1154 write_todclock(); /* lets just write the clock here */
1155} 528}
1156 529
1157/* clean up everything before exiting */ 530/* clean up everything before exiting */
1158void cleanup(void) 531void
532emergency_save ()
1159{ 533{
1160 LOG(llevDebug,"Cleanup called. freeing data.\n"); 534 LOG (llevDebug, "emergency save begin.\n");
1161 clean_tmp_files(); 535
536 LOG (llevDebug, "saving players.\n");
537 for_all_players (pl)
538 pl->save (1);
539
540// for_all_players (pl)
541// if (pl->ob)
542// pl->ob->remove ();
543
544 LOG (llevDebug, "saving maps.\n");
545 maptile::emergency_save ();
546
547 LOG (llevDebug, "saving book archive.\n");
1162 write_book_archive(); 548 write_book_archive ();
1163#ifdef MEMORY_DEBUG 549
1164 free_all_maps(); 550 LOG (llevDebug, "emergency save done.\n");
1165 free_style_maps(); 551}
1166 free_all_object_data(); 552
1167 free_all_archs(); 553/* clean up everything before exiting */
1168 free_all_treasures(); 554void
1169 free_all_images(); 555cleanup (bool make_core)
1170 free_all_newserver(); 556{
1171 free_all_recipes(); 557 LOG (llevDebug, "cleanup begin.\n");
1172 free_all_readable(); 558
1173 free_all_god(); 559 in_cleanup = true;
1174 free_all_anim(); 560
1175 /* See what the string data that is out there that hasn't been freed. */ 561 if (init_done)
1176/* LOG(llevDebug, ss_dump_table(0xff));*/ 562 emergency_save ();
1177#endif 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
1178 exit(0); 572 _exit (0);
1179} 573}
1180 574
575void
1181void leave(player *pl, int draw_exit) { 576leave (player *pl, int draw_exit)
1182 if (pl != NULL) { 577{
1183 /* We do this so that the socket handling routine can do the final 578 if (pl)
1184 * cleanup. We also leave that loop to actually handle the freeing 579 {
1185 * of the data.
1186 */
1187 if (pl->ob->type != DEAD_OBJECT) 580 if (pl->ob->type != DEAD_OBJECT)
1188 { 581 {
1189 pl->socket.status = Ns_Dead;
1190
1191 /* If a hidden dm dropped connection do not create 582 /* If a hidden dm dropped connection do not create
1192 * inconsistencies by showing that they have left the game 583 * inconsistencies by showing that they have left the game
1193 */ 584 */
1194 if (!(QUERY_FLAG(pl->ob,FLAG_WIZ) && pl->ob->contr->hidden) 585 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
1195 && draw_exit 586 && draw_exit)
1196 && (pl->state != ST_GET_NAME && pl->state!=ST_GET_PASSWORD && pl->state != ST_CONFIRM_PASSWORD))
1197 { 587 {
1198 if (pl->ob->map) 588 if (pl->ob->map)
1199 { 589 {
1200 INVOKE_PLAYER (LOGOUT, pl); 590 INVOKE_PLAYER (LOGOUT, pl);
1201 LOG (llevInfo,"LOGOUT: Player named %s from ip %s\n", pl->ob->name, pl->socket.host); 591 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
1202 } 592 }
1203 593
1204 char buf[MAX_BUF]; 594 char buf[MAX_BUF];
595
1205 sprintf (buf, "%s left the game.", pl->ob->name); 596 sprintf (buf, "%s left the game.", &pl->ob->name);
1206 new_draw_info(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, buf); 597 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
1207 } 598 }
1208 599
1209 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 600 pl->ob->remove ();
1210 leave_map (pl->ob);
1211
1212 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */ 601 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
1213 } 602 }
1214 }
1215}
1216 603
604 /* We do this so that the socket handling routine can do the final
605 * cleanup. We also leave that loop to actually handle the freeing
606 * of the data.
607 */
608 if (pl->ns)
609 pl->ns->destroy ();
610
611 }
612}
613
614int
1217int forbid_play(void) 615forbid_play (void)
1218{ 616{
1219#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE) 617#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
1220 char buf[MAX_BUF], day[MAX_BUF]; 618 char buf[MAX_BUF], day[MAX_BUF];
1221 FILE *fp; 619 FILE *fp;
1222 time_t clock; 620 time_t clock;
1223 struct tm *tm; 621 struct tm *tm;
1224 int i, start, stop, forbit=0, comp; 622 int i, start, stop, forbit = 0, comp;
1225 623
1226 clock = time (NULL); 624 clock = time (NULL);
1227 tm = (struct tm *) localtime (&clock); 625 tm = (struct tm *) localtime (&clock);
1228 626
1229 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE); 627 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
1230 if ((fp = open_and_uncompress(buf, 0, &comp)) == NULL) 628 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
1231 return 0; 629 return 0;
1232 630
1233 while (fgets (buf, MAX_BUF, fp)) { 631 while (fgets (buf, MAX_BUF, fp))
1234 if (buf[0]=='#') continue; 632 {
633 if (buf[0] == '#')
634 continue;
1235 if (!strncmp (buf, "msg", 3)) { 635 if (!strncmp (buf, "msg", 3))
636 {
1236 if (forbit) 637 if (forbit)
1237 while (fgets (buf, MAX_BUF, fp)) /* print message */ 638 while (fgets (buf, MAX_BUF, fp)) /* print message */
1238 fputs (buf, logfile); 639 fputs (buf, logfile);
1239 break; 640 break;
1240 641
642 }
1241 } else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) { 643 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
644 {
1242 LOG(llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 645 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
1243 continue; 646 continue;
1244 } 647 }
1245 648
1246 for (i=0; i< 7; i++) { 649 for (i = 0; i < 7; i++)
1247 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && 650 {
1248 (tm->tm_hour >= start) && (tm->tm_hour < stop)) 651 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
1249 forbit = 1; 652 forbit = 1;
1250 } 653 }
1251 } 654 }
1252 655
1253 close_and_delete(fp, comp); 656 close_and_delete (fp, comp);
1254 657
1255 return forbit; 658 return forbit;
1256#else 659#else
1257 return 0; 660 return 0;
1258#endif 661#endif
1259} 662}
1260 663
1261/* 664/*
1262 * do_specials() is a collection of functions to call from time to time. 665 * do_specials() is a collection of functions to call from time to time.
… …
1272 * doing the various things. 675 * doing the various things.
1273 */ 676 */
1274 677
1275extern unsigned long todtick; 678extern unsigned long todtick;
1276 679
680void
1277void do_specials(void) { 681do_specials (void)
1278 682{
1279#ifdef WATCHDOG
1280 if (!(pticks % 503))
1281 watchdog();
1282#endif
1283
1284 if (!(pticks % PTICKS_PER_CLOCK)) 683 if (!(pticks % PTICKS_PER_CLOCK))
1285 tick_the_clock(); 684 tick_the_clock ();
1286 685
1287 if (!(pticks % 509)) 686 if (!(pticks % 7))
1288 flush_old_maps(); /* Clears the tmp-files of maps which have reset */ 687 shstr::gc ();
1289 688
1290 if (!(pticks % 2503)) 689 if (!(pticks % 2503))
1291 fix_weight(); /* Hack to fix weightproblems caused by bugs */ 690 fix_weight (); /* Hack to fix weightproblems caused by bugs */
1292 691
1293 if (!(pticks % 2521))
1294 metaserver_update(); /* 2500 ticks is about 5 minutes */
1295
1296 if (!(pticks % 5003)) 692 if (!(pticks % 5003))
1297 write_book_archive(); 693 write_book_archive ();
1298 694
1299 if (!(pticks % 5009)) 695 if (!(pticks % 5009))
1300 clean_friendly_list(); 696 clean_friendly_list ();
1301 697
1302 if (!(pticks % 5011)) 698 if (!(pticks % 5011))
1303 obsolete_parties(); 699 obsolete_parties ();
1304 700
1305 if (!(pticks % 12503)) 701 if (!(pticks % 12503))
1306 fix_luck(); 702 fix_luck ();
1307} 703}
1308 704
705void
1309void server_tick () 706server_tick ()
1310{ 707{
1311 nroferrors = 0; 708 // first do the user visible stuff
1312
1313 doeric_server(); 709 doeric_server ();
1314 INVOKE_GLOBAL (CLOCK); 710 INVOKE_GLOBAL (CLOCK);
1315 process_events(NULL); /* "do" something with objects with speed */ 711 process_events (); /* "do" something with objects with speed */
1316 flush_sockets(); 712 flush_sockets ();
1317 check_active_maps(); /* Removes unused maps after a certain timeout */ 713
714 // then do some bookkeeping, should not really be here
1318 do_specials(); /* Routines called from time to time. */ 715 do_specials (); /* Routines called from time to time. */
716 attachable::check_mortals ();
1319 717
1320 ++pticks; 718 ++pticks;
1321} 719}
1322 720
721int
1323int main(int argc, char **argv) 722main (int argc, char **argv)
1324{ 723{
1325 settings.argc = argc; 724 settings.argc = argc;
1326 settings.argv = argv; 725 settings.argv = argv;
1327 726
1328 init (argc, argv); 727 init (argc, argv);
1329 728
1330 cfperl_init ();
1331 initPlugins (); 729 initPlugins ();
1332 730
1333 for (;;) 731 for (;;)
1334 cfperl_main (); 732 cfperl_main ();
1335 733
1336 // unreached 734 // unreached
1337 emergency_save (0);
1338 cleanup (); 735 cleanup ();
1339 736
1340 return 0; 737 return 0;
1341} 738}

Diff Legend

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