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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.62 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.84 by root, Sat Jan 13 23:45:46 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <object.h> 26#include <object.h>
26#include <tod.h> 27#include <tod.h>
27 28
… …
45}; 46};
46 47
47void 48void
48version (object *op) 49version (object *op)
49{ 50{
50 if (op != NULL) 51 if (op)
51 clear_win_info (op); 52 clear_win_info (op);
52 53
53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire v%s", VERSION); 54 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION);
54 55
55/* If in a socket, don't print out the list of authors. It confuses the
56 * crossclient program.
57 */
58 if (op == NULL)
59 return;
60 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 56 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
57 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
58 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
59 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
60 new_draw_info (NDI_UNIQUE, 0, op, "");
61 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
61 new_draw_info (NDI_UNIQUE, 0, op, "mwedel@sonic.net (Mark Wedel)"); 62 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)"); 63 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)"); 64 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)"); 65 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)"); 66 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)"); 67 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)"); 68 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)"); 69 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)"); 70 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
70 new_draw_info (NDI_UNIQUE, 0, op, "c.blackwood@rdt.monash.edu.au (Cameron Blackwood)"); 71 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)"); 72 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)"); 73 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)"); 74 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)"); 75 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)"); 76 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)"); 77 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)"); 78 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)"); 79 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)"); 80 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)"); 81 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)"); 82 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)"); 83 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)"); 84 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)"); 85 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)"); 86 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)"); 87 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)"); 88 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)"); 89 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)"); 90 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)"); 91 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)"); 92 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)"); 93 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)"); 94 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)"); 95 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)"); 96 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)"); 97 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)"); 98 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)"); 99 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]"); 100 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"); 101 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
102 new_draw_info (NDI_UNIQUE, 0, op, "");
101 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 103 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
102 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 104 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
103 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais [david_eg@mail.com]"); 105 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]"); 106 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]"); 107 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]"); 108 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
109 new_draw_info (NDI_UNIQUE, 0, op, "");
107 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 110 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} 111}
132 112
133/* This is a basic little function to put the player back to his 113/* This is a basic little function to put the player back to his
134 * savebed. We do some error checking - its possible that the 114 * savebed. We do some error checking - its possible that the
135 * savebed map may no longer exist, so we make sure the player 115 * savebed map may no longer exist, so we make sure the player
136 * goes someplace. 116 * goes someplace.
137 */ 117 */
138void 118void
139enter_player_savebed (object *op) 119enter_player_savebed (object *op)
140{ 120{
141 maptile *oldmap = op->map;
142 object *tmp;
143
144 tmp = object::create (); 121 object *tmp = object::create ();
145
146 EXIT_PATH (tmp) = op->contr->savebed_map; 122 EXIT_PATH (tmp) = op->contr->savebed_map;
147 EXIT_X (tmp) = op->contr->bed_x; 123 EXIT_X (tmp) = op->contr->bed_x;
148 EXIT_Y (tmp) = op->contr->bed_y; 124 EXIT_Y (tmp) = op->contr->bed_y;
149 op->enter_exit (tmp); 125 op->enter_exit (tmp);
150
151 /* If the player has not changed maps and the name does not match
152 * that of the savebed, his savebed map is gone. Lets go back
153 * to the emergency path. Update what the players savebed is
154 * while we're at it.
155 */
156 //TODO: must go - move to interim map
157 if (oldmap == op->map && strcmp (op->contr->savebed_map, oldmap->path))
158 {
159 LOG (llevDebug, "Player %s savebed location %s is invalid - going to emergency location\n",
160 &op->name, op->contr->savebed_map);
161 strcpy (op->contr->savebed_map, "/world/world_105_115");
162 op->contr->bed_x = 5;
163 op->contr->bed_y = 37;
164 EXIT_PATH (tmp) = op->contr->savebed_map;
165 EXIT_X (tmp) = op->contr->bed_x;
166 EXIT_Y (tmp) = op->contr->bed_y;
167 op->enter_exit (tmp);
168 }
169
170 tmp->destroy (); 126 tmp->destroy ();
171} 127}
172 128
173/* 129/*
174 * enter_map(): Moves the player and pets from current map (if any) to 130 * enter_map(): Moves the player and pets from current map (if any) to
… …
178 * the function that calls this should figure them out. 134 * the function that calls this should figure them out.
179 */ 135 */
180void 136void
181object::enter_map (maptile *newmap, int x, int y) 137object::enter_map (maptile *newmap, int x, int y)
182{ 138{
183 if (!newmap->load ()) 139 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
184 return; 140 return;
185 141
186 if (out_of_map (newmap, x, y)) 142 if (out_of_map (newmap, x, y))
187 { 143 {
188 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 144 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
194 &newmap->path, x, y, newmap->width, newmap->height); 150 &newmap->path, x, y, newmap->width, newmap->height);
195 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 151 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
196 return; 152 return;
197 } 153 }
198 } 154 }
155
156 if (contr && map != newmap && map)
157 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
158 return;
159
160 // remove, so stupid ob_locked does not trigger a failure
161 remove ();
199 162
200 /* try to find a spot for the player */ 163 /* try to find a spot for the player */
201 if (ob_blocked (this, newmap, x, y)) 164 if (ob_blocked (this, newmap, x, y))
202 { /* First choice blocked */ 165 { /* First choice blocked */
203 /* We try to find a spot for the player, starting closest in. 166 /* We try to find a spot for the player, starting closest in.
… …
224 else 187 else
225 /* not much we can do in this case. */ 188 /* not much we can do in this case. */
226 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y); 189 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y);
227 } 190 }
228 191
229 if (map) 192 if (contr && map != newmap)
230 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 193 {
231 return;
232
233 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 194 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
234 return; 195 return;
235 196
236 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 197 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
237 return; 198 return;
238 199 }
239 /* If it is a player login, he has yet to be inserted anyplace.
240 * otherwise, we need to deal with removing the player here.
241 */
242 remove ();
243 200
244 this->x = x; 201 this->x = x;
245 this->y = y; 202 this->y = y;
246 map = newmap; 203 map = newmap;
247 204
248 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 205 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
249 206
250 newmap->timeout = 0;
251 enemy = NULL; 207 enemy = 0;
252 208
253 if (contr) 209 if (contr)
254 { 210 {
255 strcpy (contr->maplevel, newmap->path); 211 contr->maplevel = newmap->path;
256 contr->count = 0; 212 contr->count = 0;
257 } 213 }
258 214
259 /* Update any golems */ 215 /* Update any golems */
260 if (type == PLAYER && contr->ranges[range_golem]) 216 if (type == PLAYER && contr->ranges[range_golem])
261 { 217 {
262 int i = find_free_spot (contr->ranges[range_golem], newmap, 218 int i = find_free_spot (contr->ranges[range_golem], newmap,
263 x, y, 1, SIZEOFFREE); 219 x, y, 1, SIZEOFFREE);
264 220
265 contr->ranges[range_golem]->remove ();
266
267 if (i == -1) 221 if (i == -1)
268 { 222 {
269 remove_friendly_object (contr->ranges[range_golem]);
270 contr->ranges[range_golem]->destroy (); 223 contr->ranges[range_golem]->destroy ();
271 contr->ranges[range_golem] = 0; 224 contr->ranges[range_golem] = 0;
272 } 225 }
273 else 226 else
274 { 227 {
275 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more) 228 for (object *tmp = contr->ranges[range_golem]; tmp; tmp = tmp->more)
276 { 229 {
277 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 230 tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x);
278 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 231 tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y);
279 tmp->map = newmap; 232 tmp->map = newmap;
280 } 233 }
281 234
282 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0); 235 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
283 contr->ranges[range_golem]->direction = 236 contr->ranges[range_golem]->direction =
284 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y); 237 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
285 } 238 }
286 } 239 }
287
288 direction = 0;
289 240
290 /* since the players map is already loaded, we don't need to worry 241 /* since the players map is already loaded, we don't need to worry
291 * about pending objects. 242 * about pending objects.
292 */ 243 */
293 remove_all_pets (newmap); 244 remove_all_pets (newmap);
294}
295
296/* clean_path takes a path and replaces all / with _
297 * We do a strcpy so that we do not change the original string.
298 */
299char *
300clean_path (const char *file)
301{
302 static char newpath[MAX_BUF], *cp;
303 assign (newpath, file);
304
305 for (cp = newpath; *cp != '\0'; cp++)
306 if (*cp == '/')
307 *cp = '_';
308
309 return newpath;
310}
311
312/* unclean_path takes a path and replaces all _ with /
313 * This basically undoes clean path.
314 * We do a strcpy so that we do not change the original string.
315 * We are smart enough to start after the last / in case we
316 * are getting passed a string that points to a unique map
317 * path.
318 */
319char *
320unclean_path (const char *src)
321{
322 static char newpath[MAX_BUF], *cp;
323
324 cp = strrchr (src, '/');
325 assign (newpath, cp ? cp + 1 : src);
326
327 for (cp = newpath; *cp != '\0'; cp++)
328 if (*cp == '_')
329 *cp = '/';
330
331 return newpath;
332} 245}
333 246
334/* process_players1 and process_players2 do all the player related stuff. 247/* process_players1 and process_players2 do all the player related stuff.
335 * I moved it out of process events and process_map. This was to some 248 * I moved it out of process events and process_map. This was to some
336 * extent for debugging as well as to get a better idea of the time used 249 * extent for debugging as well as to get a better idea of the time used
… …
349 flag = 0; 262 flag = 0;
350 for_all_players (pl) 263 for_all_players (pl)
351 { 264 {
352 pl->refcnt_chk (); 265 pl->refcnt_chk ();
353 266
354 if (!pl->ob || !pl->ns) 267 if (!pl->ob || !pl->ns || !pl->ob->active)
355 continue; 268 continue;
356 269
357 if (pl->ob->speed_left > 0) 270 if (pl->ob->speed_left > 0)
358 if (handle_newcs_player (pl->ob)) 271 if (handle_newcs_player (pl->ob))
359 flag = 1; 272 flag = 1;
… …
364 * player quits - they exist for purposes of tracking on the map, 277 * player quits - they exist for purposes of tracking on the map,
365 * but don't actually reside on any actual map. 278 * but don't actually reside on any actual map.
366 */ 279 */
367 if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) 280 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
368 continue; 281 continue;
369
370#ifdef AUTOSAVE
371 /* check for ST_PLAYING state so that we don't try to save off when
372 * the player is logging in.
373 */
374 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
375 {
376 pl->ob->contr->save ();
377 pl->last_save_tick = pticks;
378 }
379#endif
380 } /* end of for loop for all the players */ 282 } /* end of for loop for all the players */
381 } /* for flag */ 283 } /* for flag */
382 284
383 for_all_players (pl) 285 for_all_players (pl)
384 { 286 {
385 if (!pl->ob || !pl->ns) 287 if (!pl->ob || !pl->ns || !pl->ob->active)
386 continue; 288 continue;
387 289
388 if (settings.casting_time) 290 if (settings.casting_time)
389 { 291 {
390 if (pl->ob->casting_time > 0) 292 if (pl->ob->casting_time > 0)
… …
430} 332}
431 333
432void 334void
433process_events () 335process_events ()
434{ 336{
435 object *op;
436
437 static object_ptr marker_;
438
439 if (!marker_)
440 marker_ = object::create ();
441
442 object *marker = marker_;
443
444 process_players1 (); 337 process_players1 ();
445 338
446 marker->active_next = active_objects; 339 for_all_actives (op)
447
448 if (marker->active_next)
449 marker->active_next->active_prev = marker;
450
451 marker->active_prev = 0;
452 active_objects = marker;
453
454 while (marker->active_next)
455 { 340 {
456 op = marker->active_next;
457
458 /* Move marker forward - swap op and marker */
459 op->active_prev = marker->active_prev;
460
461 if (op->active_prev)
462 op->active_prev->active_next = op;
463 else
464 active_objects = op;
465
466 marker->active_next = op->active_next;
467
468 if (marker->active_next)
469 marker->active_next->active_prev = marker;
470
471 marker->active_prev = op;
472 op->active_next = marker;
473
474 /* Now process op */ 341 /* Now process op */
475 if (QUERY_FLAG (op, FLAG_FREED)) 342 if (QUERY_FLAG (op, FLAG_FREED))
476 { 343 {
477 LOG (llevError, "BUG: process_events(): Free object on list\n"); 344 LOG (llevError, "BUG: process_events(): Free object on list\n");
478 op->set_speed (0); 345 op->set_speed (0);
… …
497 free (dump); 364 free (dump);
498 op->destroy (); 365 op->destroy ();
499 continue; 366 continue;
500 } 367 }
501 368
502 if (!op->speed) 369 if (!op->has_active_speed ())
503 { 370 {
504 LOG (llevError, "BUG: process_events(): Object %s has no speed, " 371 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
505 "but is on active list\n", &op->arch->name); 372 "but is on active list\n", op->debug_desc (), op->speed);
506 op->set_speed (0); 373 op->set_speed (0);
507 continue; 374 continue;
508 } 375 }
509 376
510 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 377 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP)
… …
558 425
559 if (op->speed_left <= 0) 426 if (op->speed_left <= 0)
560 op->speed_left += FABS (op->speed); 427 op->speed_left += FABS (op->speed);
561 } 428 }
562 429
563 /* Remove marker object from active list */
564 if (marker->active_prev != NULL)
565 marker->active_prev->active_next = NULL;
566 else
567 active_objects = NULL;
568
569 process_players2 (); 430 process_players2 ();
570} 431}
571 432
572/* clean up everything before exiting */ 433/* clean up everything before exiting */
573void 434void
574emergency_save () 435emergency_save ()
575{ 436{
576 LOG (llevDebug, "emergency save begin.\n"); 437 LOG (llevDebug, "emergency save begin.\n");
577 438
578 LOG (llevDebug, "saving players.\n");
579 for_all_players (pl)
580 pl->save (1);
581
582// for_all_players (pl)
583// if (pl->ob)
584// pl->ob->remove ();
585
586 LOG (llevDebug, "saving maps.\n");
587 maptile::emergency_save (); 439 cfperl_emergency_save ();
588 440
589 LOG (llevDebug, "saving book archive.\n"); 441 LOG (llevDebug, "saving book archive.\n");
590 write_book_archive (); 442 write_book_archive ();
591 443
592 LOG (llevDebug, "emergency save done.\n"); 444 LOG (llevDebug, "emergency save done.\n");
593} 445}
594 446
447// send all clients some informational text
448static void
449cleanup_inform (const char *cause, bool make_core)
450{
451 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
452
453 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
454 new_draw_info_format (flags, 0, 0, "Cause for this shtudown: %s\n", cause);
455
456 if (make_core)
457 new_draw_info_format (flags, 0, 0, "This is considered a crash.\n");
458 else
459 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown.\n");
460
461 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
462
463 flush_sockets ();
464}
465
595/* clean up everything before exiting */ 466/* clean up everything before exiting */
596void 467void
597cleanup (bool make_core) 468cleanup (const char *cause, bool make_core)
598{ 469{
470 if (make_core)
471 if (!fork ())
472 abort ();
473
474 LOG (llevError, "cleanup cause: %s\n", cause);
475
476 if (!make_core)
477 cleanup_inform (cause, make_core);
478
599 LOG (llevDebug, "cleanup begin.\n"); 479 LOG (llevDebug, "cleanup begin.\n");
600 480
481 if (init_done && !in_cleanup)
482 {
601 in_cleanup = true; 483 in_cleanup = true;
602
603 if (init_done)
604 emergency_save (); 484 emergency_save ();
485 }
486 else
487 in_cleanup = true;
605 488
606 LOG (llevDebug, "running cleanup handlers.\n"); 489 LOG (llevDebug, "running cleanup handlers.\n");
607 INVOKE_GLOBAL (CLEANUP); 490 INVOKE_GLOBAL (CLEANUP);
608 491
609 LOG (llevDebug, "cleanup done.\n"); 492 LOG (llevDebug, "cleanup done.\n");
610 493
611 if (make_core) 494 if (make_core)
612 abort (); 495 {
496 cleanup_inform (cause, make_core);
497 _exit (1);
498 }
613 else 499 else
614 _exit (0); 500 _exit (0);
615}
616
617void
618leave (player *pl, int draw_exit)
619{
620 if (pl)
621 {
622 if (pl->ob->type != DEAD_OBJECT)
623 {
624 /* If a hidden dm dropped connection do not create
625 * inconsistencies by showing that they have left the game
626 */
627 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
628 && draw_exit)
629 {
630 if (pl->ob->map)
631 {
632 INVOKE_PLAYER (LOGOUT, pl);
633 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
634 }
635
636 char buf[MAX_BUF];
637
638 sprintf (buf, "%s left the game.", &pl->ob->name);
639 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
640 }
641
642 pl->ob->remove ();
643 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
644 }
645
646 /* We do this so that the socket handling routine can do the final
647 * cleanup. We also leave that loop to actually handle the freeing
648 * of the data.
649 */
650 if (pl->ns)
651 pl->ns->destroy ();
652
653 }
654} 501}
655 502
656int 503int
657forbid_play (void) 504forbid_play (void)
658{ 505{
… …
672 519
673 while (fgets (buf, MAX_BUF, fp)) 520 while (fgets (buf, MAX_BUF, fp))
674 { 521 {
675 if (buf[0] == '#') 522 if (buf[0] == '#')
676 continue; 523 continue;
524
677 if (!strncmp (buf, "msg", 3)) 525 if (!strncmp (buf, "msg", 3))
678 { 526 {
679 if (forbit) 527 if (forbit)
680 while (fgets (buf, MAX_BUF, fp)) /* print message */ 528 while (fgets (buf, MAX_BUF, fp)) /* print message */
681 fputs (buf, logfile); 529 fputs (buf, logfile);
682 break; 530 break;
683
684 } 531 }
685 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 532 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
686 { 533 {
687 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 534 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
688 continue; 535 continue;
… …
702 return 0; 549 return 0;
703#endif 550#endif
704} 551}
705 552
706/* 553/*
707 * do_specials() is a collection of functions to call from time to time. 554 * do_specials() is a collection of functions to call from time to time.
708 * Modified 2000-1-14 MSW to use the global pticks count to determine how 555 * Modified 2000-1-14 MSW to use the global pticks count to determine how
709 * often to do things. This will allow us to spred them out more often. 556 * often to do things. This will allow us to spred them out more often.
710 * I use prime numbers for the factor count - in that way, it is less likely 557 * I use prime numbers for the factor count - in that way, it is less likely
711 * these actions will fall on the same tick (compared to say using 500/2500/15000 558 * these actions will fall on the same tick (compared to say using 500/2500/15000
712 * which would mean on that 15,000 tick count a whole bunch of stuff gets 559 * which would mean on that 15,000 tick count a whole bunch of stuff gets
… …
770 617
771 initPlugins (); 618 initPlugins ();
772 619
773 for (;;) 620 for (;;)
774 cfperl_main (); 621 cfperl_main ();
775
776 // unreached
777 cleanup ();
778
779 return 0;
780} 622}
623

Diff Legend

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