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.8 by root, Sun Aug 27 16:15:13 2006 UTC vs.
Revision 1.28 by root, Thu Sep 14 23:13:49 2006 UTC

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

Diff Legend

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