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.61 by root, Wed Dec 27 18:09:49 2006 UTC vs.
Revision 1.63 by root, Sat Dec 30 16:56:16 2006 UTC

… …
55/* 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
56 * crossclient program. 56 * crossclient program.
57 */ 57 */
58 if (op == NULL) 58 if (op == NULL)
59 return; 59 return;
60
60 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>");
61 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>");
62 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>");
63 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>");
64 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>");
65 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>");
66 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>");
67 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>");
68 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>");
69 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>");
70 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>");
71 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>");
72 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>");
73 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>");
74 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>");
75 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>");
76 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>");
77 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>");
78 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>");
79 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>");
80 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>");
81 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>");
82 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>");
83 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>");
84 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>");
85 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>");
86 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>");
87 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>");
88 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>");
89 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>");
90 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>");
91 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>");
92 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>");
93 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>");
94 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>");
95 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>");
96 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>");
97 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>");
98 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>");
99 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>");
100 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
101 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
102 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
103 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>");
104 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>");
105 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>");
106 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>");
107 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
108}
109
110void
111info_keys (object *op)
112{
113 clear_win_info (op);
114 new_draw_info (NDI_UNIQUE, 0, op, "Push `hjklynub' to walk in a direction.");
115 new_draw_info (NDI_UNIQUE, 0, op, "Shift + dir = fire, Ctrl + dir = run");
116 new_draw_info (NDI_UNIQUE, 0, op, "(To fire at yourself, hit `.'");
117 new_draw_info (NDI_UNIQUE, 0, op, "To attack, walk into the monsters.");
118 new_draw_info (NDI_UNIQUE, 0, op, "\" = speak ' = extended command");
119 new_draw_info (NDI_UNIQUE, 0, op, "i = inventory , = get : = look");
120 new_draw_info (NDI_UNIQUE, 0, op, "<> = rotate d = drop ? = help");
121 new_draw_info (NDI_UNIQUE, 0, op, "a = apply A = apply below t = throw");
122 new_draw_info (NDI_UNIQUE, 0, op, "e = examine E = exa below @ = autopick");
123 new_draw_info (NDI_UNIQUE, 0, op, "C = configure s = brace v = version");
124 new_draw_info (NDI_UNIQUE, 0, op, "+- = change range <tab> = browse spells");
125 new_draw_info (NDI_UNIQUE, 0, op, "x = change inventory type");
126 new_draw_info (NDI_UNIQUE, 0, op, "Mouse: L = examine, M = apply, R = drop/get");
127 new_draw_info (NDI_UNIQUE, 0, op, "'help = info about extended commands.");
128 new_draw_info (NDI_UNIQUE, 0, op, "Ctrl-R = refresh Ctrl-C = clear");
129 new_draw_info (NDI_UNIQUE, 0, op, "You can type a number before most commands.");
130 new_draw_info (NDI_UNIQUE, 0, op, "(For instance 3d drops 3 items.)");
131} 113}
132 114
133/* 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
134 * savebed. We do some error checking - its possible that the 116 * savebed. We do some error checking - its possible that the
135 * 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
136 * goes someplace. 118 * goes someplace.
137 */ 119 */
138void 120void
139enter_player_savebed (object *op) 121enter_player_savebed (object *op)
140{ 122{
141 maptile *oldmap = op->map;
142 object *tmp;
143
144 tmp = object::create (); 123 object *tmp = object::create ();
145
146 EXIT_PATH (tmp) = op->contr->savebed_map; 124 EXIT_PATH (tmp) = op->contr->savebed_map;
147 EXIT_X (tmp) = op->contr->bed_x; 125 EXIT_X (tmp) = op->contr->bed_x;
148 EXIT_Y (tmp) = op->contr->bed_y; 126 EXIT_Y (tmp) = op->contr->bed_y;
149 enter_exit (op, tmp); 127 op->enter_exit (tmp);
150 /* If the player has not changed maps and the name does not match
151 * that of the savebed, his savebed map is gone. Lets go back
152 * to the emergency path. Update what the players savebed is
153 * while we're at it.
154 */
155 if (oldmap == op->map && strcmp (op->contr->savebed_map, oldmap->path))
156 {
157 LOG (llevDebug, "Player %s savebed location %s is invalid - going to emergency location (%s)\n",
158 settings.emergency_mapname, &op->name, op->contr->savebed_map);
159 strcpy (op->contr->savebed_map, settings.emergency_mapname);
160 op->contr->bed_x = settings.emergency_x;
161 op->contr->bed_y = settings.emergency_y;
162 EXIT_PATH (tmp) = op->contr->savebed_map;
163 EXIT_X (tmp) = op->contr->bed_x;
164 EXIT_Y (tmp) = op->contr->bed_y;
165 enter_exit (op, tmp);
166 }
167
168 tmp->destroy (); 128 tmp->destroy ();
169} 129}
170 130
171/* All this really is is a glorified remove_object that also updates
172 * the counts on the map if needed.
173 */
174void
175leave_map (object *op)
176{
177 maptile *oldmap = op->map;
178
179 op->remove ();
180
181 if (oldmap)
182 {
183 if (!op->contr->hidden)
184 oldmap->players--;
185
186 if (oldmap->players <= 0)
187 /* can be less than zero due to errors in tracking this */
188 set_map_timeout (oldmap);
189 }
190}
191
192/* 131/*
193 * 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
194 * 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
195 * 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
196 * whatever reason. If default map coordinates are to be used, then 135 * whatever reason. If default map coordinates are to be used, then
197 * the function that calls this should figure them out. 136 * the function that calls this should figure them out.
198 */ 137 */
199static void 138void
200enter_map (object *op, maptile *newmap, int x, int y) 139object::enter_map (maptile *newmap, int x, int y)
201{ 140{
202 maptile *oldmap = op->map; 141 if (!newmap->load ())
142 return;
203 143
204 if (out_of_map (newmap, x, y)) 144 if (out_of_map (newmap, x, y))
205 { 145 {
206 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);
207 x = newmap->enter_x; 147 x = newmap->enter_x;
208 y = newmap->enter_y; 148 y = newmap->enter_y;
209 if (out_of_map (newmap, x, y)) 149 if (out_of_map (newmap, x, y))
210 { 150 {
211 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",
212 newmap->path, x, y, newmap->width, newmap->height); 152 &newmap->path, x, y, newmap->width, newmap->height);
213 new_draw_info (NDI_UNIQUE, 0, op, "The exit is closed"); 153 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
214 return; 154 return;
215 } 155 }
216 } 156 }
217 157
218 /* try to find a spot for the player */ 158 /* try to find a spot for the player */
219 if (ob_blocked (op, newmap, x, y)) 159 if (ob_blocked (this, newmap, x, y))
220 { /* First choice blocked */ 160 { /* First choice blocked */
221 /* 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.
222 * 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,
223 * 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
224 * if other spaces around are available. 164 * if other spaces around are available.
225 * 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
226 * 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.
227 */ 167 */
228 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);
229 169
230 if (i == -1) 170 if (i == -1)
231 { 171 {
232 i = find_free_spot (op, newmap, x, y, 1, SIZEOFFREE2 + 1); 172 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
233 if (i == -1) 173 if (i == -1)
234 i = find_free_spot (op, newmap, x, y, 1, SIZEOFFREE); 174 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
235 } 175 }
236 176
237 if (i != -1) 177 if (i != -1)
238 { 178 {
239 x += freearr_x[i]; 179 x += freearr_x[i];
240 y += freearr_y[i]; 180 y += freearr_y[i];
241 } 181 }
242 else 182 else
243 {
244 /* not much we can do in this case. */ 183 /* not much we can do in this case. */
245 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);
246 } 185 }
247 } /* end if looking for free spot */
248 186
249 if (op->map) 187 if (map)
250 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) 188 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
251 return; 189 return;
252 190
253 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)))
254 return; 192 return;
255 193
256 if (INVOKE_MAP (ENTER, newmap, 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)))
257 return; 195 return;
258 196
259 /* 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.
260 * otherwise, we need to deal with removing the player here. 198 * otherwise, we need to deal with removing the player here.
261 */ 199 */
262 op->remove (); 200 remove ();
263 201
264 /* remove_ob clears these so they must be reset after the remove_ob call */
265 op->x = x; 202 this->x = x;
266 op->y = y; 203 this->y = y;
267 op->map = newmap; 204 map = newmap;
268 205
269 insert_ob_in_map (op, op->map, NULL, INS_NO_WALK_ON); 206 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
270
271 if (!op->contr->hidden)
272 newmap->players++;
273 207
274 newmap->timeout = 0; 208 newmap->timeout = 0;
275 op->enemy = NULL; 209 enemy = NULL;
276 210
277 if (op->contr) 211 if (contr)
278 { 212 {
279 strcpy (op->contr->maplevel, newmap->path); 213 strcpy (contr->maplevel, newmap->path);
280 op->contr->count = 0; 214 contr->count = 0;
281 } 215 }
282 216
283 /* Update any golems */ 217 /* Update any golems */
284 if (op->type == PLAYER && op->contr->ranges[range_golem] != NULL) 218 if (type == PLAYER && contr->ranges[range_golem])
285 { 219 {
286 int i = find_free_spot (op->contr->ranges[range_golem], newmap, 220 int i = find_free_spot (contr->ranges[range_golem], newmap,
287 x, y, 1, SIZEOFFREE); 221 x, y, 1, SIZEOFFREE);
288 222
289 op->contr->ranges[range_golem]->remove (); 223 contr->ranges[range_golem]->remove ();
290 224
291 if (i == -1) 225 if (i == -1)
292 { 226 {
293 remove_friendly_object (op->contr->ranges[range_golem]); 227 remove_friendly_object (contr->ranges[range_golem]);
294 op->contr->ranges[range_golem]->destroy (); 228 contr->ranges[range_golem]->destroy ();
295 op->contr->ranges[range_golem] = 0; 229 contr->ranges[range_golem] = 0;
296 } 230 }
297 else 231 else
298 { 232 {
299 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)
300 { 234 {
301 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);
302 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);
303 tmp->map = newmap; 237 tmp->map = newmap;
304 } 238 }
305 239
306 insert_ob_in_map (op->contr->ranges[range_golem], newmap, NULL, 0); 240 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
307 op->contr->ranges[range_golem]->direction = 241 contr->ranges[range_golem]->direction =
308 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);
309 } 243 }
310 } 244 }
311 245
312 op->direction = 0; 246 direction = 0;
313 247
314 /* 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
315 * about pending objects. 249 * about pending objects.
316 */ 250 */
317 remove_all_pets (newmap); 251 remove_all_pets (newmap);
318
319 /* If the player is changing maps, we need to do some special things
320 * Do this after the player is on the new map - otherwise the force swap of the
321 * old map does not work.
322 */
323 if (oldmap != newmap)
324 {
325 if (oldmap) /* adjust old map */
326 {
327 oldmap->players--;
328
329 if (oldmap->players <= 0) /* can be less than zero due to errors in tracking this */
330 set_map_timeout (oldmap);
331 }
332 }
333} 252}
334
335void
336set_map_timeout (maptile *oldmap)
337{
338#if MAP_MAXTIMEOUT
339 oldmap->timeout = oldmap->timeout;
340 /* Do MINTIMEOUT first, so that MAXTIMEOUT is used if that is
341 * lower than the min value.
342 */
343# if MAP_MINTIMEOUT
344 if (oldmap->timeout < MAP_MINTIMEOUT)
345 oldmap->timeout = MAP_MINTIMEOUT;
346# endif
347
348 if (oldmap->timeout > MAP_MAXTIMEOUT)
349 oldmap->timeout = MAP_MAXTIMEOUT;
350
351#else
352 /* save out the map */
353 swap_map (oldmap);
354#endif /* MAP_MAXTIMEOUT */
355}
356
357 253
358/* clean_path takes a path and replaces all / with _ 254/* clean_path takes a path and replaces all / with _
359 * 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.
360 */ 256 */
361char * 257char *
… …
368 if (*cp == '/') 264 if (*cp == '/')
369 *cp = '_'; 265 *cp = '_';
370 266
371 return newpath; 267 return newpath;
372} 268}
373
374 269
375/* unclean_path takes a path and replaces all _ with / 270/* unclean_path takes a path and replaces all _ with /
376 * This basically undoes clean path. 271 * This basically undoes clean path.
377 * 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.
378 * 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
… …
390 for (cp = newpath; *cp != '\0'; cp++) 285 for (cp = newpath; *cp != '\0'; cp++)
391 if (*cp == '_') 286 if (*cp == '_')
392 *cp = '/'; 287 *cp = '/';
393 288
394 return newpath; 289 return newpath;
395}
396
397
398/* The player is trying to enter a randomly generated map. In this case, generate the
399 * random map as needed.
400 */
401
402static void
403enter_random_map (object *pl, object *exit_ob)
404{
405 maptile *new_map;
406 char newmap_name[HUGE_BUF], *cp;
407 static int reference_number = 0;
408 RMParms rp;
409
410 memset (&rp, 0, sizeof (RMParms));
411 rp.Xsize = -1;
412 rp.Ysize = -1;
413 rp.region = get_region_by_map (exit_ob->map);
414 if (exit_ob->msg)
415 set_random_map_variable (&rp, exit_ob->msg);
416 rp.origin_x = exit_ob->x;
417 rp.origin_y = exit_ob->y;
418 strcpy (rp.origin_map, pl->map->path);
419
420 /* If we have a final_map, use it as a base name to give some clue
421 * as where the player is. Otherwise, use the origin map.
422 */
423 sprintf (newmap_name, "/random%s+%04d",
424 *rp.final_map ? rp.final_map : rp.origin_map,
425 reference_number++);
426
427 /* now to generate the actual map. */
428 new_map = generate_random_map (newmap_name, &rp);
429
430 /* Update the exit_ob so it now points directly at the newly created
431 * random maps. Not that it is likely to happen, but it does mean that a
432 * exit in a unique map leading to a random map will not work properly.
433 * It also means that if the created random map gets reset before
434 * the exit leading to it, that the exit will no longer work.
435 */
436 if (new_map)
437 {
438 int x, y;
439
440 x = EXIT_X (exit_ob) = new_map->enter_x;
441 y = EXIT_Y (exit_ob) = new_map->enter_y;
442 EXIT_PATH (exit_ob) = newmap_name;
443 strcpy (new_map->path, newmap_name);
444 enter_map (pl, new_map, x, y);
445 }
446}
447
448/* The player is trying to enter a non-randomly generated template map. In this
449 * case, use a map file for a template
450 */
451
452static void
453enter_fixed_template_map (object *pl, object *exit_ob)
454{
455 maptile *new_map;
456 char tmpnum[32], exitpath[HUGE_BUF], resultname[HUGE_BUF], tmpstring[HUGE_BUF], *sourcemap;
457 const char *new_map_name;
458
459 /* Split the exit path string into two parts, one
460 * for where to store the map, and one for were
461 * to generate the map from.
462 */
463 snprintf (exitpath, sizeof (exitpath), "%s", EXIT_PATH (exit_ob) + 2);
464 sourcemap = strchr (exitpath, '!');
465 if (!sourcemap)
466 {
467 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is closed.", &exit_ob->name);
468 /* Should only occur when no source map is set.
469 */
470 LOG (llevError, "enter_fixed_template_map: Exit %s (%d,%d) on map %s has no source template.\n",
471 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
472 return;
473 }
474
475 *sourcemap++ = '\0';
476
477 /* If we are not coming from a template map, we can use relative directories
478 * for the map to generate from.
479 */
480 if (!exit_ob->map->templatemap)
481 sourcemap = path_combine_and_normalize (exit_ob->map->path, sourcemap);
482
483 /* Do replacement of %x, %y, and %n to the x coord of the exit, the y coord
484 * of the exit, and the name of the map the exit is on, respectively.
485 */
486 sprintf (tmpnum, "%d", exit_ob->x);
487 replace (exitpath, "%x", tmpnum, resultname, sizeof (resultname));
488
489 sprintf (tmpnum, "%d", exit_ob->y);
490 sprintf (tmpstring, "%s", resultname);
491 replace (tmpstring, "%y", tmpnum, resultname, sizeof (resultname));
492
493 sprintf (tmpstring, "%s", resultname);
494 replace (tmpstring, "%n", exit_ob->map->name, resultname, sizeof (resultname));
495
496 /* If we are coming from another template map, use reletive paths unless
497 * indicated otherwise.
498 */
499 if (exit_ob->map->templatemap && (resultname[0] != '/'))
500 new_map_name = path_combine_and_normalize (exit_ob->map->path, resultname);
501 else
502 new_map_name = create_template_pathname (resultname);
503
504 /* Attempt to load the map, if unable to, then
505 * create the map from the template.
506 */
507 new_map = ready_map_name (new_map_name, MAP_PLAYER_UNIQUE);
508 if (!new_map)
509 {
510 new_map = load_original_map (create_pathname (sourcemap), MAP_PLAYER_UNIQUE);
511 if (new_map)
512 fix_auto_apply (new_map);
513 }
514
515 if (new_map)
516 {
517 /* set the path of the map to where it should be
518 * so we don't just save over the source map.
519 */
520 strcpy (new_map->path, new_map_name);
521 new_map->templatemap = 1;
522 enter_map (pl, new_map, EXIT_X (exit_ob), EXIT_Y (exit_ob));
523 }
524 else
525 {
526 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is closed.", &exit_ob->name);
527 /* Should only occur when an invalid source map is set.
528 */
529 LOG (llevDebug, "enter_fixed_template_map: Exit %s (%d,%d) on map %s leads no where.\n",
530 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
531 }
532}
533
534/* The player is trying to enter a randomly generated template map. In this
535 * case, generate the map as needed.
536 */
537
538static void
539enter_random_template_map (object *pl, object *exit_ob)
540{
541 maptile *new_map;
542 char tmpnum[32], resultname[HUGE_BUF], tmpstring[HUGE_BUF];
543 const char *new_map_name;
544 RMParms rp;
545
546 /* Do replacement of %x, %y, and %n to the x coord of the exit, the y coord
547 * of the exit, and the name of the map the exit is on, respectively.
548 */
549 sprintf (tmpnum, "%d", exit_ob->x);
550 replace (EXIT_PATH (exit_ob) + 3, "%x", tmpnum, resultname, sizeof (resultname));
551
552 sprintf (tmpnum, "%d", exit_ob->y);
553 sprintf (tmpstring, "%s", resultname);
554 replace (tmpstring, "%y", tmpnum, resultname, sizeof (resultname));
555
556 sprintf (tmpstring, "%s", resultname);
557 replace (tmpstring, "%n", exit_ob->map->name, resultname, sizeof (resultname));
558
559 /* If we are coming from another template map, use reletive paths unless
560 * indicated otherwise.
561 */
562 if (exit_ob->map->templatemap && (resultname[0] != '/'))
563 new_map_name = path_combine_and_normalize (exit_ob->map->path, resultname);
564 else
565 new_map_name = create_template_pathname (resultname);
566
567 new_map = ready_map_name (new_map_name, MAP_PLAYER_UNIQUE);
568 if (!new_map)
569 {
570 memset (&rp, 0, sizeof (RMParms));
571 rp.Xsize = -1;
572 rp.Ysize = -1;
573 rp.region = get_region_by_map (exit_ob->map);
574 if (exit_ob->msg)
575 set_random_map_variable (&rp, exit_ob->msg);
576 rp.origin_x = exit_ob->x;
577 rp.origin_y = exit_ob->y;
578 strcpy (rp.origin_map, pl->map->path);
579
580 /* now to generate the actual map. */
581 new_map = generate_random_map (new_map_name, &rp);
582 }
583
584
585 /* Update the exit_ob so it now points directly at the newly created
586 * random maps. Not that it is likely to happen, but it does mean that a
587 * exit in a unique map leading to a random map will not work properly.
588 * It also means that if the created random map gets reset before
589 * the exit leading to it, that the exit will no longer work.
590 */
591 if (new_map)
592 {
593 int x, y;
594
595 x = EXIT_X (exit_ob) = new_map->enter_x;
596 y = EXIT_Y (exit_ob) = new_map->enter_y;
597 new_map->templatemap = 1;
598 enter_map (pl, new_map, x, y);
599 }
600}
601
602
603/* Code to enter/detect a character entering a unique map.
604 */
605static void
606enter_unique_map (object *op, object *exit_ob)
607{
608 char apartment[HUGE_BUF];
609 maptile *newmap;
610
611 if (EXIT_PATH (exit_ob)[0] == '/')
612 {
613 sprintf (apartment, "%s/%s/%s/%s", settings.localdir, settings.playerdir, &op->name, clean_path (EXIT_PATH (exit_ob)));
614 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
615 if (!newmap)
616 {
617 newmap = load_original_map (create_pathname (EXIT_PATH (exit_ob)), MAP_PLAYER_UNIQUE);
618 if (newmap)
619 fix_auto_apply (newmap);
620 }
621 }
622 else
623 { /* relative directory */
624 char reldir[HUGE_BUF], tmpc[HUGE_BUF], *cp;
625
626 if (exit_ob->map->unique)
627 {
628
629 strcpy (reldir, unclean_path (exit_ob->map->path));
630
631 /* Need to copy this over, as clean_path only has one static return buffer */
632 strcpy (tmpc, clean_path (reldir));
633 /* Remove final component, if any */
634 if ((cp = strrchr (tmpc, '_')) != NULL)
635 *cp = 0;
636
637 sprintf (apartment, "%s/%s/%s/%s_%s", settings.localdir, settings.playerdir, &op->name, tmpc, clean_path (EXIT_PATH (exit_ob)));
638
639 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
640 if (!newmap)
641 {
642 newmap = load_original_map (create_pathname (path_combine_and_normalize (reldir, EXIT_PATH (exit_ob))), MAP_PLAYER_UNIQUE);
643 if (newmap)
644 fix_auto_apply (newmap);
645 }
646 }
647 else
648 {
649 /* The exit is unique, but the map we are coming from is not unique. So
650 * use the basic logic - don't need to demangle the path name
651 */
652 sprintf (apartment, "%s/%s/%s/%s", settings.localdir,
653 settings.playerdir, &op->name, clean_path (path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob))));
654 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
655 if (!newmap)
656 {
657 newmap = ready_map_name (path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)), 0);
658 if (newmap)
659 fix_auto_apply (newmap);
660 }
661 }
662 }
663
664 if (newmap)
665 {
666 strcpy (newmap->path, apartment);
667 newmap->unique = 1;
668 enter_map (op, newmap, EXIT_X (exit_ob), EXIT_Y (exit_ob));
669 }
670 else
671 {
672 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", &exit_ob->name);
673 /* Perhaps not critical, but I would think that the unique maps
674 * should be new enough this does not happen. This also creates
675 * a strange situation where some players could perhaps have visited
676 * such a map before it was removed, so they have the private
677 * map, but other players can't get it anymore.
678 */
679 LOG (llevDebug, "enter_unique_map: Exit %s (%d,%d) on map %s is leads no where.\n",
680 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
681 }
682
683}
684
685
686/* Tries to move 'op' to exit_ob. op is the character or monster that is
687 * using the exit, where exit_ob is the exit object (boat, door, teleporter,
688 * etc.) if exit_ob is null, then op->contr->maplevel contains that map to
689 * move the object to. This is used when loading the player.
690 *
691 * Largely redone by MSW 2001-01-21 - this function was overly complex
692 * and had some obscure bugs.
693 */
694
695void
696enter_exit (object *op, object *exit_ob)
697{
698#define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */
699 object *tmp;
700
701 /* It may be nice to support other creatures moving across
702 * exits, but right now a lot of the code looks at op->contr,
703 * so that is an RFE.
704 */
705 if (op->type != PLAYER)
706 return;
707
708 /* First, lets figure out what map the player is going to go to */
709 if (exit_ob)
710 {
711 /* check to see if we make a template map */
712 if (EXIT_PATH (exit_ob) && EXIT_PATH (exit_ob)[1] == '@')
713 {
714 if (EXIT_PATH (exit_ob)[2] == '!')
715 {
716 /* generate a template map randomly */
717 enter_random_template_map (op, exit_ob);
718 }
719 else
720 {
721 /* generate a template map from a fixed template */
722 enter_fixed_template_map (op, exit_ob);
723 }
724 }
725 /* check to see if we make a randomly generated map */
726 else if (EXIT_PATH (exit_ob) && EXIT_PATH (exit_ob)[1] == '!')
727 {
728 enter_random_map (op, exit_ob);
729 }
730 else if (QUERY_FLAG (exit_ob, FLAG_UNIQUE))
731 {
732 enter_unique_map (op, exit_ob);
733 }
734 else
735 {
736 int x = EXIT_X (exit_ob), y = EXIT_Y (exit_ob);
737
738 /* 'Normal' exits that do not do anything special
739 * Simple enough we don't need another routine for it.
740 */
741 maptile *newmap;
742
743 if (exit_ob->map)
744 {
745 newmap = ready_map_name (path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)), 0);
746 /* Random map was previously generated, but is no longer about. Lets generate a new
747 * map.
748 */
749 if (!newmap && !strncmp (EXIT_PATH (exit_ob), "/random/", 8))
750 {
751 /* Maps that go down have a message set. However, maps that go
752 * up, don't. If the going home has reset, there isn't much
753 * point generating a random map, because it won't match the maps.
754 */
755 if (exit_ob->msg)
756 {
757 enter_random_map (op, exit_ob);
758 }
759 else
760 {
761 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", &exit_ob->name);
762 return;
763 }
764
765 /* For exits that cause damages (like pits). Don't know if any
766 * random maps use this or not.
767 */
768 if (exit_ob->stats.dam && op->type == PLAYER)
769 hit_player (op, exit_ob->stats.dam, exit_ob, exit_ob->attacktype, 1);
770 return;
771 }
772 }
773 else
774 {
775 /* For word of recall and other force objects
776 * They contain the full pathname of the map to go back to,
777 * so we don't need to normalize it.
778 * But we do need to see if it is unique or not
779 */
780 if (!strncmp (EXIT_PATH (exit_ob), settings.localdir, strlen (settings.localdir)))
781 newmap = ready_map_name (EXIT_PATH (exit_ob), MAP_PLAYER_UNIQUE);
782 else
783 newmap = ready_map_name (EXIT_PATH (exit_ob), 0);
784 }
785 if (!newmap)
786 {
787 if (exit_ob->name)
788 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", &exit_ob->name);
789 /* don't cry to momma if name is not set - as in tmp objects
790 * used by the savebed code and character creation */
791 return;
792 }
793
794 /* This supports the old behaviour, but it really should not be used.
795 * I will note for example that with this method, it is impossible to
796 * set 0,0 destination coordinates. Really, if we want to support
797 * using the new maps default coordinates, the exit ob should use
798 * something like -1, -1 so it is clear to do that.
799 */
800 if (x == 0 && y == 0)
801 {
802 x = newmap->enter_x;
803 y = newmap->enter_y;
804 LOG (llevDebug, "enter_exit: Exit %s (%d,%d) on map %s is 0 destination coordinates\n",
805 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map ? exit_ob->map->path : "<nil>");
806 }
807
808 /* mids 02/13/2002 if exit is damned, update players death & WoR home-position and delete town portal */
809 if (QUERY_FLAG (exit_ob, FLAG_DAMNED))
810 {
811 /* remove an old force with a slaying field == PORTAL_DESTINATION_NAME */
812 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
813 {
814 if (tmp->type == FORCE && tmp->slaying && !strcmp (tmp->slaying, PORTAL_DESTINATION_NAME))
815 break;
816 }
817 if (tmp)
818 {
819 tmp->remove ();
820 tmp->destroy ();
821 }
822
823 strcpy (op->contr->savebed_map, path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)));
824 op->contr->bed_x = EXIT_X (exit_ob), op->contr->bed_y = EXIT_Y (exit_ob);
825 op->contr->save ();
826 /* LOG(llevDebug,"enter_exit: Taking damned exit %s to (%d,%d) on map %s\n",
827 * exit_ob->name?exit_ob->name:"(none)", exit_ob->x, exit_ob->y,
828 * path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob))); */
829 }
830
831 enter_map (op, newmap, x, y);
832 }
833 /* For exits that cause damages (like pits) */
834 if (exit_ob->stats.dam && op->type == PLAYER)
835 hit_player (op, exit_ob->stats.dam, exit_ob, exit_ob->attacktype, 1);
836 }
837 else
838 {
839 int flags = 0;
840 maptile *newmap;
841
842 /* Hypothetically, I guess its possible that a standard map matches
843 * the localdir, but that seems pretty unlikely - unlikely enough that
844 * I'm not going to attempt to try to deal with that possibility.
845 * We use the fact that when a player saves on a unique map, it prepends
846 * the localdir to that name. So its an easy way to see of the map is
847 * unique or not.
848 */
849 if (!strncmp (op->contr->maplevel, settings.localdir, strlen (settings.localdir)))
850 flags = MAP_PLAYER_UNIQUE;
851
852 /* newmap returns the map (if already loaded), or loads it for
853 * us.
854 */
855 newmap = ready_map_name (op->contr->maplevel, flags);
856 if (!newmap)
857 {
858 LOG (llevError, "enter_exit: Pathname to map does not exist! (%s)\n", op->contr->maplevel);
859 newmap = ready_map_name (settings.emergency_mapname, 0);
860 op->x = settings.emergency_x;
861 op->y = settings.emergency_y;
862 /* If we can't load the emergency map, something is probably really
863 * screwed up, so bail out now.
864 */
865 if (!newmap)
866 {
867 LOG (llevError, "enter_exit: could not load emergency map? Fatal error\n");
868 abort ();
869 }
870 }
871
872 enter_map (op, newmap, op->x, op->y);
873 }
874} 290}
875 291
876/* process_players1 and process_players2 do all the player related stuff. 292/* process_players1 and process_players2 do all the player related stuff.
877 * 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
878 * 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
… …
1109 active_objects = NULL; 525 active_objects = NULL;
1110 526
1111 process_players2 (); 527 process_players2 ();
1112} 528}
1113 529
1114void
1115clean_tmp_files (void)
1116{
1117 maptile *m, *next;
1118
1119 LOG (llevInfo, "Cleaning up...\n");
1120
1121 /* We save the maps - it may not be intuitive why, but if there are unique
1122 * items, we need to save the map so they get saved off. Perhaps we should
1123 * just make a special function that only saves the unique items.
1124 */
1125 for_all_maps (m)
1126 if (m->in_memory == MAP_IN_MEMORY)
1127 /* If we want to reuse the temp maps, swap it out (note that will also
1128 * update the log file.
1129 */
1130 swap_map (m);
1131
1132 write_todclock (); /* lets just write the clock here */
1133}
1134
1135/* clean up everything before exiting */ 530/* clean up everything before exiting */
1136void 531void
532emergency_save ()
533{
534 LOG (llevDebug, "emergency save begin.\n");
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");
548 write_book_archive ();
549
550 LOG (llevDebug, "emergency save done.\n");
551}
552
553/* clean up everything before exiting */
554void
1137cleanup (bool make_core) 555cleanup (bool make_core)
1138{ 556{
1139 LOG (llevDebug, "Cleanup called.\n"); 557 LOG (llevDebug, "cleanup begin.\n");
558
559 in_cleanup = true;
1140 560
1141 if (init_done) 561 if (init_done)
1142 { 562 emergency_save ();
1143 for_all_players (pl)
1144 pl->save (1);
1145 563
1146 for_all_players (pl) 564 LOG (llevDebug, "running cleanup handlers.\n");
1147 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
1148 leave_map (pl->ob);
1149
1150 clean_tmp_files ();
1151 write_book_archive ();
1152
1153 INVOKE_GLOBAL (CLEANUP); 565 INVOKE_GLOBAL (CLEANUP);
1154 } 566
567 LOG (llevDebug, "cleanup done.\n");
1155 568
1156 if (make_core) 569 if (make_core)
1157 abort (); 570 abort ();
1158 else 571 else
1159 _exit (0); 572 _exit (0);
… …
1182 595
1183 sprintf (buf, "%s left the game.", &pl->ob->name); 596 sprintf (buf, "%s left the game.", &pl->ob->name);
1184 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf); 597 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
1185 } 598 }
1186 599
1187 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 600 pl->ob->remove ();
1188 leave_map (pl->ob);
1189
1190 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */ 601 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
1191 } 602 }
1192 603
1193 /* 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
1194 * cleanup. We also leave that loop to actually handle the freeing 605 * cleanup. We also leave that loop to actually handle the freeing
… …
1273 tick_the_clock (); 684 tick_the_clock ();
1274 685
1275 if (!(pticks % 7)) 686 if (!(pticks % 7))
1276 shstr::gc (); 687 shstr::gc ();
1277 688
1278 if (!(pticks % 79))
1279 flush_old_maps (); /* Clears the tmp-files of maps which have reset */
1280
1281 if (!(pticks % 2503)) 689 if (!(pticks % 2503))
1282 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 690 fix_weight (); /* Hack to fix weightproblems caused by bugs */
1283 691
1284 if (!(pticks % 5003)) 692 if (!(pticks % 5003))
1285 write_book_archive (); 693 write_book_archive ();
… …
1295} 703}
1296 704
1297void 705void
1298server_tick () 706server_tick ()
1299{ 707{
1300 nroferrors = 0;
1301
1302 // first do the user visible stuff 708 // first do the user visible stuff
1303 doeric_server (); 709 doeric_server ();
1304 INVOKE_GLOBAL (CLOCK); 710 INVOKE_GLOBAL (CLOCK);
1305 process_events (); /* "do" something with objects with speed */ 711 process_events (); /* "do" something with objects with speed */
1306 flush_sockets (); 712 flush_sockets ();
1307 713
1308 // then do some bookkeeping, should not really be here 714 // then do some bookkeeping, should not really be here
1309 check_active_maps (); /* Removes unused maps after a certain timeout */
1310 do_specials (); /* Routines called from time to time. */ 715 do_specials (); /* Routines called from time to time. */
1311 attachable::check_mortals (); 716 attachable::check_mortals ();
1312 717
1313 ++pticks; 718 ++pticks;
1314} 719}
… …
1325 730
1326 for (;;) 731 for (;;)
1327 cfperl_main (); 732 cfperl_main ();
1328 733
1329 // unreached 734 // unreached
1330 emergency_save (0);
1331 cleanup (); 735 cleanup ();
1332 736
1333 return 0; 737 return 0;
1334} 738}

Diff Legend

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