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

Diff Legend

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