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.6 by root, Fri Aug 25 13:24:50 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.6 2006/08/25 13:24:50 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 INVOKE_PLAYER (LEAVE, op->contr);
294
295 /* 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 */
296 op->x = x; 314 op->x = x;
297 op->y = y; 315 op->y = y;
298 op->map = newmap; 316 op->map = newmap;
299 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);
300 318
301 INVOKE_PLAYER (ENTER, op->contr); 319 INVOKE_MAP (ENTER, op->map, ARG_PLAYER (op->contr));
302 320
303 if (!op->contr->hidden) 321 if (!op->contr->hidden)
304 newmap->players++; 322 newmap->players++;
305 323
306 newmap->timeout=0; 324 newmap->timeout = 0;
307 op->enemy = NULL; 325 op->enemy = NULL;
308 326
309 if (op->contr) { 327 if (op->contr)
328 {
310 strcpy(op->contr->maplevel, newmap->path); 329 strcpy (op->contr->maplevel, newmap->path);
311 op->contr->count=0; 330 op->contr->count = 0;
312 } 331 }
313 332
314 /* Update any golems */ 333 /* Update any golems */
315 if(op->type == PLAYER && op->contr->ranges[range_golem] != NULL) { 334 if (op->type == PLAYER && op->contr->ranges[range_golem] != NULL)
335 {
316 int i = find_free_spot(op->contr->ranges[range_golem],newmap, 336 int i = find_free_spot (op->contr->ranges[range_golem], newmap,
317 x, y, 1, SIZEOFFREE); 337 x, y, 1, SIZEOFFREE);
338
318 remove_ob(op->contr->ranges[range_golem]); 339 remove_ob (op->contr->ranges[range_golem]);
319 if (i==-1) { 340 if (i == -1)
341 {
320 remove_friendly_object(op->contr->ranges[range_golem]); 342 remove_friendly_object (op->contr->ranges[range_golem]);
321 free_object(op->contr->ranges[range_golem]); 343 free_object (op->contr->ranges[range_golem]);
322 op->contr->ranges[range_golem]=NULL; 344 op->contr->ranges[range_golem] = NULL;
323 op->contr->golem_count=0; 345 op->contr->golem_count = 0;
324 } 346 }
325 else { 347 else
348 {
326 object *tmp; 349 object *tmp;
350
327 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 {
328 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);
329 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);
330 tmp->map = newmap; 355 tmp->map = newmap;
331 } 356 }
332 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);
333 op->contr->ranges[range_golem]->direction = 358 op->contr->ranges[range_golem]->direction =
334 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);
335 op->y - op->contr->ranges[range_golem]->y); 360 }
336 }
337 } 361 }
338 op->direction=0; 362 op->direction = 0;
339 363
340 /* 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
341 * about pending objects. 365 * about pending objects.
342 */ 366 */
343 remove_all_pets(newmap); 367 remove_all_pets (newmap);
344 368
345 /* 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
346 * 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
347 * old map does not work. 371 * old map does not work.
348 */ 372 */
349 if (oldmap != newmap) { 373 if (oldmap != newmap)
374 {
350 if (oldmap) /* adjust old map */ 375 if (oldmap) /* adjust old map */
351 { 376 {
352 oldmap->players--; 377 oldmap->players--;
353 378
354 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 */
355 set_map_timeout(oldmap); 380 set_map_timeout (oldmap);
356 } 381 }
357 } 382 }
358 swap_below_max (newmap->path);
359} 383}
360 384
385void
361void set_map_timeout(mapstruct *oldmap) 386set_map_timeout (mapstruct *oldmap)
362{ 387{
363#if MAP_MAXTIMEOUT 388#if MAP_MAXTIMEOUT
364 oldmap->timeout = MAP_TIMEOUT(oldmap); 389 oldmap->timeout = MAP_TIMEOUT (oldmap);
365 /* Do MINTIMEOUT first, so that MAXTIMEOUT is used if that is 390 /* Do MINTIMEOUT first, so that MAXTIMEOUT is used if that is
366 * lower than the min value. 391 * lower than the min value.
367 */ 392 */
368#if MAP_MINTIMEOUT 393# if MAP_MINTIMEOUT
369 if (oldmap->timeout < MAP_MINTIMEOUT) { 394 if (oldmap->timeout < MAP_MINTIMEOUT)
395 {
370 oldmap->timeout = MAP_MINTIMEOUT; 396 oldmap->timeout = MAP_MINTIMEOUT;
371 } 397 }
372#endif 398# endif
373 if (oldmap->timeout > MAP_MAXTIMEOUT) { 399 if (oldmap->timeout > MAP_MAXTIMEOUT)
400 {
374 oldmap->timeout = MAP_MAXTIMEOUT; 401 oldmap->timeout = MAP_MAXTIMEOUT;
375 } 402 }
376#else 403#else
377 /* save out the map */ 404 /* save out the map */
378 swap_map(oldmap); 405 swap_map (oldmap);
379#endif /* MAP_MAXTIMEOUT */ 406#endif /* MAP_MAXTIMEOUT */
380} 407}
381 408
382 409
383/* clean_path takes a path and replaces all / with _ 410/* clean_path takes a path and replaces all / with _
384 * 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.
385 */ 412 */
413char *
386char *clean_path(const char *file) 414clean_path (const char *file)
387{ 415{
388 static char newpath[MAX_BUF],*cp; 416 static char newpath[MAX_BUF], *cp;
417 assign (newpath, file);
389 418
390 strncpy(newpath, file, MAX_BUF-1);
391 newpath[MAX_BUF-1]='\0';
392 for (cp=newpath; *cp!='\0'; cp++) { 419 for (cp = newpath; *cp != '\0'; cp++)
393 if (*cp=='/') *cp='_'; 420 if (*cp == '/')
394 } 421 *cp = '_';
422
395 return newpath; 423 return newpath;
396} 424}
397 425
398 426
399/* unclean_path takes a path and replaces all _ with / 427/* unclean_path takes a path and replaces all _ with /
400 * This basically undoes clean path. 428 * This basically undoes clean path.
401 * 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.
402 * 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
403 * are getting passed a string that points to a unique map 431 * are getting passed a string that points to a unique map
404 * path. 432 * path.
405 */ 433 */
434char *
406char *unclean_path(const char *src) 435unclean_path (const char *src)
407{ 436{
408 static char newpath[MAX_BUF],*cp; 437 static char newpath[MAX_BUF], *cp;
409 438
410 cp=strrchr(src, '/'); 439 cp = strrchr (src, '/');
411 if (cp) 440 assign (newpath, cp ? cp + 1 : src);
412 strncpy(newpath, cp+1, MAX_BUF-1);
413 else
414 strncpy(newpath, src, MAX_BUF-1);
415 newpath[MAX_BUF-1]='\0';
416 441
417 for (cp=newpath; *cp!='\0'; cp++) { 442 for (cp = newpath; *cp != '\0'; cp++)
418 if (*cp=='_') *cp='/'; 443 if (*cp == '_')
419 } 444 *cp = '/';
445
420 return newpath; 446 return newpath;
421} 447}
422 448
423 449
424/* 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
425 * random map as needed. 451 * random map as needed.
426 */ 452 */
427 453
454static void
428static void enter_random_map(object *pl, object *exit_ob) 455enter_random_map (object *pl, object *exit_ob)
429{ 456{
430 mapstruct *new_map; 457 mapstruct *new_map;
431 char newmap_name[HUGE_BUF], *cp; 458 char newmap_name[HUGE_BUF], *cp;
432 static int reference_number = 0; 459 static int reference_number = 0;
433 RMParms rp; 460 RMParms rp;
434 461
435 memset(&rp, 0, sizeof(RMParms)); 462 memset (&rp, 0, sizeof (RMParms));
436 rp.Xsize=-1; 463 rp.Xsize = -1;
437 rp.Ysize=-1; 464 rp.Ysize = -1;
438 rp.region=get_region_by_map(exit_ob->map); 465 rp.region = get_region_by_map (exit_ob->map);
466 if (exit_ob->msg)
439 if (exit_ob->msg) set_random_map_variable(&rp,exit_ob->msg); 467 set_random_map_variable (&rp, exit_ob->msg);
440 rp.origin_x = exit_ob->x; 468 rp.origin_x = exit_ob->x;
441 rp.origin_y = exit_ob->y; 469 rp.origin_y = exit_ob->y;
442 strcpy(rp.origin_map, pl->map->path); 470 strcpy (rp.origin_map, pl->map->path);
443 471
444 /* 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
445 * as where the player is. Otherwise, use the origin map. 473 * as where the player is. Otherwise, use the origin map.
446 * Take the last component (after the last slash) to give 474 * Take the last component (after the last slash) to give
447 * shorter names without bogus slashes. 475 * shorter names without bogus slashes.
448 */ 476 */
449 if (rp.final_map[0]) { 477 if (rp.final_map[0])
478 {
450 cp = strrchr(rp.final_map, '/'); 479 cp = strrchr (rp.final_map, '/');
451 if (!cp) cp = rp.final_map; 480 if (!cp)
452 } else { 481 cp = rp.final_map;
482 }
483 else
484 {
453 char buf[HUGE_BUF]; 485 char buf[HUGE_BUF];
454 486
455 cp = strrchr(rp.origin_map, '/'); 487 cp = strrchr (rp.origin_map, '/');
456 if (!cp) cp = rp.origin_map; 488 if (!cp)
489 cp = rp.origin_map;
457 /* Need to strip of any trailing digits, if it has them */ 490 /* Need to strip of any trailing digits, if it has them */
458 strcpy(buf, cp); 491 strcpy (buf, cp);
459 while (isdigit(buf[strlen(buf) - 1])) 492 while (isdigit (buf[strlen (buf) - 1]))
460 buf[strlen(buf) - 1] = 0; 493 buf[strlen (buf) - 1] = 0;
461 cp = buf; 494 cp = buf;
462 } 495 }
463 496
464 sprintf(newmap_name,"/random/%s%04d",cp+1, reference_number++); 497 sprintf (newmap_name, "/random/%s%04d", cp + 1, reference_number++);
465 498
466 /* now to generate the actual map. */ 499 /* now to generate the actual map. */
467 new_map=generate_random_map(newmap_name,&rp); 500 new_map = generate_random_map (newmap_name, &rp);
468 501
469 /* 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
470 * 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
471 * 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.
472 * 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
473 * 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.
474 */ 507 */
475 if(new_map) { 508 if (new_map)
476 int x, y; 509 {
510 int x, y;
511
477 x=EXIT_X(exit_ob) = MAP_ENTER_X(new_map); 512 x = EXIT_X (exit_ob) = MAP_ENTER_X (new_map);
478 y=EXIT_Y(exit_ob) = MAP_ENTER_Y(new_map); 513 y = EXIT_Y (exit_ob) = MAP_ENTER_Y (new_map);
479 EXIT_PATH(exit_ob) = add_string(newmap_name); 514 EXIT_PATH (exit_ob) = newmap_name;
480 strcpy(new_map->path, newmap_name); 515 strcpy (new_map->path, newmap_name);
481 enter_map(pl, new_map, x, y); 516 enter_map (pl, new_map, x, y);
482 } 517 }
483} 518}
484 519
485/* 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
486 * case, use a map file for a template 521 * case, use a map file for a template
487 */ 522 */
488 523
524static void
489static void enter_fixed_template_map(object *pl, object *exit_ob) 525enter_fixed_template_map (object *pl, object *exit_ob)
490{ 526{
491 mapstruct *new_map; 527 mapstruct *new_map;
492 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;
493 const char *new_map_name; 529 const char *new_map_name;
494 530
495 /* Split the exit path string into two parts, one 531 /* Split the exit path string into two parts, one
496 * for where to store the map, and one for were 532 * for where to store the map, and one for were
497 * to generate the map from. 533 * to generate the map from.
498 */ 534 */
499 snprintf(exitpath, sizeof(exitpath), "%s", EXIT_PATH(exit_ob)+2); 535 snprintf (exitpath, sizeof (exitpath), "%s", EXIT_PATH (exit_ob) + 2);
500 sourcemap = strchr(exitpath, '!'); 536 sourcemap = strchr (exitpath, '!');
501 if (!sourcemap) { 537 if (!sourcemap)
538 {
502 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);
503 /* Should only occur when no source map is set. 540 /* Should only occur when no source map is set.
504 */ 541 */
505 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",
506 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);
507 return; 544 return;
508 } 545 }
509 *sourcemap++ = '\0'; 546 *sourcemap++ = '\0';
510 547
511 /* 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
512 * for the map to generate from. 549 * for the map to generate from.
513 */ 550 */
514 if (!exit_ob->map->templatemap) { 551 if (!exit_ob->map->templatemap)
552 {
515 sourcemap = path_combine_and_normalize(exit_ob->map->path, sourcemap); 553 sourcemap = path_combine_and_normalize (exit_ob->map->path, sourcemap);
516 }
517 554 }
555
518 /* 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
519 * 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.
520 */ 558 */
521 sprintf(tmpnum ,"%d", exit_ob->x); 559 sprintf (tmpnum, "%d", exit_ob->x);
522 replace(exitpath, "%x", tmpnum, resultname, sizeof(resultname)); 560 replace (exitpath, "%x", tmpnum, resultname, sizeof (resultname));
523 561
524 sprintf(tmpnum ,"%d", exit_ob->y); 562 sprintf (tmpnum, "%d", exit_ob->y);
525 sprintf(tmpstring, "%s", resultname); 563 sprintf (tmpstring, "%s", resultname);
526 replace(tmpstring, "%y", tmpnum, resultname, sizeof(resultname)); 564 replace (tmpstring, "%y", tmpnum, resultname, sizeof (resultname));
527 565
528 sprintf(tmpstring, "%s", resultname); 566 sprintf (tmpstring, "%s", resultname);
529 replace(tmpstring, "%n", exit_ob->map->name, resultname, sizeof(resultname)); 567 replace (tmpstring, "%n", exit_ob->map->name, resultname, sizeof (resultname));
530 568
531 /* 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
532 * indicated otherwise. 570 * indicated otherwise.
533 */ 571 */
534 if (exit_ob->map->templatemap && (resultname[0] != '/')) { 572 if (exit_ob->map->templatemap && (resultname[0] != '/'))
573 {
535 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);
536 } else { 575 }
576 else
577 {
537 new_map_name = create_template_pathname(resultname); 578 new_map_name = create_template_pathname (resultname);
538 }
539 579 }
580
540 /* Attempt to load the map, if unable to, then 581 /* Attempt to load the map, if unable to, then
541 * create the map from the template. 582 * create the map from the template.
542 */ 583 */
543 new_map = ready_map_name(new_map_name, MAP_PLAYER_UNIQUE); 584 new_map = ready_map_name (new_map_name, MAP_PLAYER_UNIQUE);
544 if (!new_map) { 585 if (!new_map)
586 {
545 new_map = load_original_map(create_pathname(sourcemap), MAP_PLAYER_UNIQUE); 587 new_map = load_original_map (create_pathname (sourcemap), MAP_PLAYER_UNIQUE);
546 if (new_map) fix_auto_apply(new_map);
547 }
548
549 if (new_map) { 588 if (new_map)
589 fix_auto_apply (new_map);
590 }
591
592 if (new_map)
593 {
550 /* set the path of the map to where it should be 594 /* set the path of the map to where it should be
551 * so we don't just save over the source map. 595 * so we don't just save over the source map.
552 */ 596 */
553 strcpy(new_map->path, new_map_name); 597 strcpy (new_map->path, new_map_name);
554 new_map->templatemap = 1; 598 new_map->templatemap = 1;
555 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));
556 } else { 600 }
601 else
602 {
557 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);
558 /* Should only occur when an invalid source map is set. 604 /* Should only occur when an invalid source map is set.
559 */ 605 */
560 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",
561 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);
562 } 608 }
563} 609}
564 610
565 611
566/* 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
567 * case, generate the map as needed. 613 * case, generate the map as needed.
568 */ 614 */
569 615
616static void
570static void enter_random_template_map(object *pl, object *exit_ob) 617enter_random_template_map (object *pl, object *exit_ob)
571{ 618{
572 mapstruct *new_map; 619 mapstruct *new_map;
573 char tmpnum[32], resultname[HUGE_BUF], tmpstring[HUGE_BUF]; 620 char tmpnum[32], resultname[HUGE_BUF], tmpstring[HUGE_BUF];
574 const char *new_map_name; 621 const char *new_map_name;
575 RMParms rp; 622 RMParms rp;
576 623
577 /* 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
578 * 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.
579 */ 626 */
580 sprintf(tmpnum ,"%d", exit_ob->x); 627 sprintf (tmpnum, "%d", exit_ob->x);
581 replace(EXIT_PATH(exit_ob)+3, "%x", tmpnum, resultname, sizeof(resultname)); 628 replace (EXIT_PATH (exit_ob) + 3, "%x", tmpnum, resultname, sizeof (resultname));
582 629
583 sprintf(tmpnum ,"%d", exit_ob->y); 630 sprintf (tmpnum, "%d", exit_ob->y);
584 sprintf(tmpstring, "%s", resultname); 631 sprintf (tmpstring, "%s", resultname);
585 replace(tmpstring, "%y", tmpnum, resultname, sizeof(resultname)); 632 replace (tmpstring, "%y", tmpnum, resultname, sizeof (resultname));
586 633
587 sprintf(tmpstring, "%s", resultname); 634 sprintf (tmpstring, "%s", resultname);
588 replace(tmpstring, "%n", exit_ob->map->name, resultname, sizeof(resultname)); 635 replace (tmpstring, "%n", exit_ob->map->name, resultname, sizeof (resultname));
589 636
590 /* 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
591 * indicated otherwise. 638 * indicated otherwise.
592 */ 639 */
593 if (exit_ob->map->templatemap && (resultname[0] != '/')) { 640 if (exit_ob->map->templatemap && (resultname[0] != '/'))
641 {
594 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);
595 } else { 643 }
644 else
645 {
596 new_map_name = create_template_pathname(resultname); 646 new_map_name = create_template_pathname (resultname);
597 } 647 }
598 648
599 new_map = ready_map_name(new_map_name, MAP_PLAYER_UNIQUE); 649 new_map = ready_map_name (new_map_name, MAP_PLAYER_UNIQUE);
600 if (!new_map) { 650 if (!new_map)
651 {
601 memset(&rp, 0, sizeof(RMParms)); 652 memset (&rp, 0, sizeof (RMParms));
602 rp.Xsize=-1; 653 rp.Xsize = -1;
603 rp.Ysize=-1; 654 rp.Ysize = -1;
604 rp.region=get_region_by_map(exit_ob->map); 655 rp.region = get_region_by_map (exit_ob->map);
656 if (exit_ob->msg)
605 if (exit_ob->msg) set_random_map_variable(&rp,exit_ob->msg); 657 set_random_map_variable (&rp, exit_ob->msg);
606 rp.origin_x = exit_ob->x; 658 rp.origin_x = exit_ob->x;
607 rp.origin_y = exit_ob->y; 659 rp.origin_y = exit_ob->y;
608 strcpy(rp.origin_map, pl->map->path); 660 strcpy (rp.origin_map, pl->map->path);
609 661
610 /* now to generate the actual map. */ 662 /* now to generate the actual map. */
611 new_map=generate_random_map(new_map_name,&rp); 663 new_map = generate_random_map (new_map_name, &rp);
612 } 664 }
613 665
614 666
615 /* 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
616 * 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
617 * 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.
618 * 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
619 * 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.
620 */ 672 */
621 if(new_map) { 673 if (new_map)
622 int x, y; 674 {
675 int x, y;
676
623 x=EXIT_X(exit_ob) = MAP_ENTER_X(new_map); 677 x = EXIT_X (exit_ob) = MAP_ENTER_X (new_map);
624 y=EXIT_Y(exit_ob) = MAP_ENTER_Y(new_map); 678 y = EXIT_Y (exit_ob) = MAP_ENTER_Y (new_map);
625 new_map->templatemap = 1; 679 new_map->templatemap = 1;
626 enter_map(pl, new_map, x, y); 680 enter_map (pl, new_map, x, y);
627 } 681 }
628} 682}
629 683
630 684
631/* Code to enter/detect a character entering a unique map. 685/* Code to enter/detect a character entering a unique map.
632 */ 686 */
687static void
633static void enter_unique_map(object *op, object *exit_ob) 688enter_unique_map (object *op, object *exit_ob)
634{ 689{
635 char apartment[HUGE_BUF]; 690 char apartment[HUGE_BUF];
636 mapstruct *newmap; 691 mapstruct *newmap;
637 692
638 if (EXIT_PATH(exit_ob)[0]=='/') { 693 if (EXIT_PATH (exit_ob)[0] == '/')
639 sprintf(apartment, "%s/%s/%s/%s", settings.localdir, 694 {
640 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)));
641 newmap = ready_map_name(apartment, MAP_PLAYER_UNIQUE);
642 if (!newmap) {
643 newmap = load_original_map(create_pathname(EXIT_PATH(exit_ob)), MAP_PLAYER_UNIQUE);
644 if (newmap) fix_auto_apply(newmap);
645 }
646 } else { /* relative directory */
647 char reldir[HUGE_BUF], tmpc[HUGE_BUF], *cp;
648
649 if (exit_ob->map->unique) {
650
651 strcpy(reldir, unclean_path(exit_ob->map->path));
652
653 /* Need to copy this over, as clean_path only has one static return buffer */
654 strcpy(tmpc, clean_path(reldir));
655 /* Remove final component, if any */
656 if ((cp=strrchr(tmpc, '_'))!=NULL) *cp=0;
657
658 sprintf(apartment, "%s/%s/%s/%s_%s", settings.localdir,
659 settings.playerdir, op->name, tmpc,
660 clean_path(EXIT_PATH(exit_ob)));
661
662 newmap = ready_map_name(apartment, MAP_PLAYER_UNIQUE); 696 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
663 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 {
664 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);
665 if (newmap) fix_auto_apply(newmap); 725 if (newmap)
666 } 726 fix_auto_apply (newmap);
667 } 727 }
668 else { 728 }
729 else
730 {
669 /* 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
670 * 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
671 */ 733 */
672 sprintf(apartment, "%s/%s/%s/%s", settings.localdir, 734 sprintf (apartment, "%s/%s/%s/%s", settings.localdir,
673 settings.playerdir, op->name, 735 settings.playerdir, &op->name, clean_path (path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob))));
674 clean_path(path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob))));
675 newmap = ready_map_name(apartment, MAP_PLAYER_UNIQUE); 736 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
676 if (!newmap) { 737 if (!newmap)
738 {
677 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);
678 if (newmap) fix_auto_apply(newmap); 740 if (newmap)
741 fix_auto_apply (newmap);
742 }
743 }
679 } 744 }
680 }
681 }
682 745
683 if (newmap) { 746 if (newmap)
747 {
684 strcpy(newmap->path, apartment); 748 strcpy (newmap->path, apartment);
685 newmap->unique = 1; 749 newmap->unique = 1;
686 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));
687 } else { 751 }
752 else
753 {
688 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);
689 /* Perhaps not critical, but I would think that the unique maps 755 /* Perhaps not critical, but I would think that the unique maps
690 * should be new enough this does not happen. This also creates 756 * should be new enough this does not happen. This also creates
691 * a strange situation where some players could perhaps have visited 757 * a strange situation where some players could perhaps have visited
692 * 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
693 * map, but other players can't get it anymore. 759 * map, but other players can't get it anymore.
694 */ 760 */
695 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",
696 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);
697 } 763 }
698 764
699} 765}
700 766
701 767
702/* 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
703 * 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,
… …
706 * 772 *
707 * 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
708 * and had some obscure bugs. 774 * and had some obscure bugs.
709 */ 775 */
710 776
777void
711void enter_exit(object *op, object *exit_ob) { 778enter_exit (object *op, object *exit_ob)
779{
712 #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 */
713 object *tmp; 781 object *tmp;
782
714 /* It may be nice to support other creatures moving across 783 /* It may be nice to support other creatures moving across
715 * 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,
716 * so thta is an RFE. 785 * so thta is an RFE.
717 */ 786 */
718 if (op->type != PLAYER) return; 787 if (op->type != PLAYER)
788 return;
719 789
720 /* Need to remove player from transport */
721 if (op->contr->transport) apply_transport(op, op->contr->transport, AP_UNAPPLY);
722
723 /* 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 */
724 if (exit_ob){ 791 if (exit_ob)
792 {
725 793
726 /* check to see if we make a template map */ 794 /* check to see if we make a template map */
727 if(EXIT_PATH(exit_ob)&&EXIT_PATH(exit_ob)[1]=='@') { 795 if (EXIT_PATH (exit_ob) && EXIT_PATH (exit_ob)[1] == '@')
796 {
728 if (EXIT_PATH(exit_ob)[2]=='!') { 797 if (EXIT_PATH (exit_ob)[2] == '!')
798 {
729 /* generate a template map randomly */ 799 /* generate a template map randomly */
730 enter_random_template_map(op, exit_ob); 800 enter_random_template_map (op, exit_ob);
801 }
731 } else { 802 else
803 {
732 /* generate a template map from a fixed template */ 804 /* generate a template map from a fixed template */
733 enter_fixed_template_map(op, exit_ob); 805 enter_fixed_template_map (op, exit_ob);
806 }
734 } 807 }
735 }
736 /* check to see if we make a randomly generated map */ 808 /* check to see if we make a randomly generated map */
737 else if(EXIT_PATH(exit_ob)&&EXIT_PATH(exit_ob)[1]=='!') { 809 else if (EXIT_PATH (exit_ob) && EXIT_PATH (exit_ob)[1] == '!')
810 {
738 enter_random_map(op, exit_ob); 811 enter_random_map (op, exit_ob);
739 } 812 }
740 else if (QUERY_FLAG(exit_ob, FLAG_UNIQUE)) { 813 else if (QUERY_FLAG (exit_ob, FLAG_UNIQUE))
814 {
741 enter_unique_map(op, exit_ob); 815 enter_unique_map (op, exit_ob);
742 } else { 816 }
817 else
818 {
743 int x=EXIT_X(exit_ob), y=EXIT_Y(exit_ob); 819 int x = EXIT_X (exit_ob), y = EXIT_Y (exit_ob);
820
744 /* 'Normal' exits that do not do anything special 821 /* 'Normal' exits that do not do anything special
745 * Simple enough we don't need another routine for it. 822 * Simple enough we don't need another routine for it.
746 */ 823 */
747 mapstruct *newmap; 824 mapstruct *newmap;
825
748 if (exit_ob->map) { 826 if (exit_ob->map)
827 {
749 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);
750 /* 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
751 * map. 830 * map.
752 */ 831 */
753 if (!newmap && !strncmp(EXIT_PATH(exit_ob),"/random/",8)) { 832 if (!newmap && !strncmp (EXIT_PATH (exit_ob), "/random/", 8))
833 {
754 /* 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
755 * 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
756 * 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.
757 */ 837 */
758 if (exit_ob->msg) {
759 enter_random_map(op, exit_ob);
760 } else {
761 new_draw_info_format(NDI_UNIQUE, 0, op, "The %s is closed.", exit_ob->name);
762 return;
763 }
764
765 /* For exits that cause damages (like pits). Don't know if any
766 * random maps use this or not.
767 */
768 if(exit_ob->stats.dam && op->type==PLAYER)
769 hit_player(op,exit_ob->stats.dam,exit_ob,exit_ob->attacktype,1);
770 return;
771 }
772 } else {
773 /* For word of recall and other force objects
774 * They contain the full pathname of the map to go back to,
775 * so we don't need to normalize it.
776 * But we do need to see if it is unique or not
777 */
778 if (!strncmp(EXIT_PATH(exit_ob), settings.localdir, strlen(settings.localdir)))
779 newmap = ready_map_name(EXIT_PATH(exit_ob), MAP_PLAYER_UNIQUE);
780 else
781 newmap = ready_map_name(EXIT_PATH(exit_ob), 0);
782 }
783 if (!newmap)
784 {
785 if (exit_ob->name) 838 if (exit_ob->msg)
839 {
840 enter_random_map (op, exit_ob);
841 }
842 else
843 {
786 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);
787 /* 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
788 * used by the savebed code and character creation */ 873 * used by the savebed code and character creation */
789 return; 874 return;
790 } 875 }
791 876
792 /* 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.
793 * 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
794 * set 0,0 destination coordinates. Really, if we want to support 879 * set 0,0 destination coordinates. Really, if we want to support
795 * using the new maps default coordinates, the exit ob should use 880 * using the new maps default coordinates, the exit ob should use
796 * something like -1, -1 so it is clear to do that. 881 * something like -1, -1 so it is clear to do that.
797 */ 882 */
798 if (x==0 && y==0) { 883 if (x == 0 && y == 0)
799 x=MAP_ENTER_X(newmap); 884 {
800 y=MAP_ENTER_Y(newmap); 885 x = MAP_ENTER_X (newmap);
886 y = MAP_ENTER_Y (newmap);
801 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",
802 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>");
803 exit_ob->map?exit_ob->map->path:"(none)"); 889 }
804 }
805 890
806 /* 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 */
807 if (QUERY_FLAG(exit_ob, FLAG_DAMNED)) { 892 if (QUERY_FLAG (exit_ob, FLAG_DAMNED))
893 {
808 /* remove an old force with a slaying field == PORTAL_DESTINATION_NAME */ 894 /* remove an old force with a slaying field == PORTAL_DESTINATION_NAME */
809 for(tmp=op->inv; tmp != NULL; tmp = tmp->below) { 895 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
896 {
810 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;
811 } 899 }
812 if(tmp) { 900 if (tmp)
901 {
813 remove_ob(tmp); 902 remove_ob (tmp);
814 free_object(tmp); 903 free_object (tmp);
815 } 904 }
816 905
817 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)));
818 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);
819 save_player(op, 1); 908 save_player (op, 1);
820 /* 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",
821 * 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,
822 * 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))); */
823 } 912 }
824 913
825 enter_map(op, newmap, x, y); 914 enter_map (op, newmap, x, y);
826 } 915 }
827 /* For exits that cause damages (like pits) */ 916 /* For exits that cause damages (like pits) */
828 if(exit_ob->stats.dam && op->type==PLAYER) 917 if (exit_ob->stats.dam && op->type == PLAYER)
829 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);
830 } else { 919 }
920 else
921 {
831 int flags = 0; 922 int flags = 0;
832 mapstruct *newmap; 923 mapstruct *newmap;
833 924
834 925
835 /* Hypothetically, I guess its possible that a standard map matches 926 /* Hypothetically, I guess its possible that a standard map matches
836 * the localdir, but that seems pretty unlikely - unlikely enough that 927 * the localdir, but that seems pretty unlikely - unlikely enough that
837 * 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.
838 * 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
839 * 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
840 * unique or not. 931 * unique or not.
841 */ 932 */
842 if (!strncmp(op->contr->maplevel, settings.localdir, strlen(settings.localdir))) 933 if (!strncmp (op->contr->maplevel, settings.localdir, strlen (settings.localdir)))
843 flags = MAP_PLAYER_UNIQUE; 934 flags = MAP_PLAYER_UNIQUE;
844 935
845 /* newmap returns the map (if already loaded), or loads it for 936 /* newmap returns the map (if already loaded), or loads it for
846 * us. 937 * us.
847 */ 938 */
848 newmap = ready_map_name(op->contr->maplevel, flags); 939 newmap = ready_map_name (op->contr->maplevel, flags);
849 if (!newmap) 940 if (!newmap)
850 { 941 {
851 LOG(llevError,
852 "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);
853 op->contr->maplevel);
854 newmap = ready_map_name(settings.emergency_mapname, 0); 943 newmap = ready_map_name (settings.emergency_mapname, 0);
855 op->x = settings.emergency_x; 944 op->x = settings.emergency_x;
856 op->y = settings.emergency_y; 945 op->y = settings.emergency_y;
857 /* 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
858 * screwed up, so bail out now. 947 * screwed up, so bail out now.
859 */ 948 */
860 if (!newmap) { 949 if (!newmap)
950 {
861 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");
862 abort(); 952 abort ();
863 } 953 }
864 } 954 }
865 enter_map(op, newmap, op->x, op->y); 955 enter_map (op, newmap, op->x, op->y);
866 } 956 }
867} 957}
868 958
869/* 959/*
870 * process_active_maps(): Works like process_events(), but it only 960 * process_active_maps(): Works like process_events(), but it only
871 * processes maps which a player is on. 961 * processes maps which a player is on.
872 * 962 *
873 */ 963 */
874 964
875#if 0 // dead code, schmorp 965#if 0 // dead code, schmorp
966void
876void process_active_maps () 967process_active_maps ()
877{ 968{
878 for (mapstruct *map = first_map; map != NULL; map = map->next) 969 for (mapstruct *map = first_map; map != NULL; map = map->next)
879 if (map->in_memory == MAP_IN_MEMORY) 970 if (map->in_memory == MAP_IN_MEMORY)
880 if (players_on_map (map, TRUE)) 971 if (players_on_map (map, TRUE))
881 process_events (map); 972 process_events (map);
… …
888 * by the various functions. process_players1() does the processing before 979 * by the various functions. process_players1() does the processing before
889 * objects have been updated, process_players2() does the processing that 980 * objects have been updated, process_players2() does the processing that
890 * is needed after the players have been updated. 981 * is needed after the players have been updated.
891 */ 982 */
892 983
984void
893void process_players1(mapstruct *map) 985process_players1 (mapstruct *map)
894{ 986{
895 int flag; 987 int flag;
896 player *pl,*plnext; 988 player *pl, *plnext;
897 989
898 /* 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. */
899 for(flag=1;flag!=0;) { 991 for (flag = 1; flag != 0;)
900 flag=0; 992 {
993 flag = 0;
901 for(pl=first_player;pl!=NULL;pl=plnext) { 994 for (pl = first_player; pl != NULL; pl = plnext)
995 {
902 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() */
903 997
904 if (pl->ob == NULL) continue; 998 if (pl->ob == NULL)
999 continue;
905 1000
906 if (map!=NULL && pl->ob->map!=map) continue; 1001 if (map != NULL && pl->ob->map != map)
1002 continue;
907 1003
908 if(pl->ob->speed_left>0) { 1004 if (pl->ob->speed_left > 0)
1005 {
909 if (handle_newcs_player(pl->ob)) 1006 if (handle_newcs_player (pl->ob))
910 flag=1; 1007 flag = 1;
911 } /* end if player has speed left */ 1008 } /* end if player has speed left */
912 1009
913 /* If the player is not actively playing, don't make a 1010 /* If the player is not actively playing, don't make a
914 * backup save - nothing to save anyway. Plus, the 1011 * backup save - nothing to save anyway. Plus, the
915 * map may not longer be valid. This can happen when the 1012 * map may not longer be valid. This can happen when the
916 * player quits - they exist for purposes of tracking on the map, 1013 * player quits - they exist for purposes of tracking on the map,
917 * but don't actually reside on any actual map. 1014 * but don't actually reside on any actual map.
918 */ 1015 */
919 if (QUERY_FLAG(pl->ob, FLAG_REMOVED)) continue; 1016 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
1017 continue;
920 1018
921#ifdef AUTOSAVE 1019#ifdef AUTOSAVE
922 /* 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
923 * the player is logging in. 1021 * the player is logging in.
924 */ 1022 */
925 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 {
926 /* Don't save the player on unholy ground. Instead, increase the 1025 /* Don't save the player on unholy ground. Instead, increase the
927 * 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
928 * again. 1027 * again.
929 */ 1028 */
930// 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) {
931// pl->last_save_tick += 100; 1030// pl->last_save_tick += 100;
932// } else { 1031// } else {
933 save_player(pl->ob,1); 1032 save_player (pl->ob, 1);
934 pl->last_save_tick = pticks; 1033 pl->last_save_tick = pticks;
935// } 1034// }
936 } 1035 }
937#endif 1036#endif
938 } /* end of for loop for all the players */ 1037 } /* end of for loop for all the players */
939 } /* for flag */ 1038 } /* for flag */
940 for(pl=first_player;pl!=NULL;pl=pl->next) { 1039 for (pl = first_player; pl != NULL; pl = pl->next)
1040 {
941 if (map!=NULL && (pl->ob == NULL || pl->ob->map!=map)) 1041 if (map != NULL && (pl->ob == NULL || pl->ob->map != map))
942 continue; 1042 continue;
943 if (settings.casting_time == TRUE) { 1043 if (settings.casting_time == TRUE)
1044 {
944 if (pl->ob->casting_time > 0){ 1045 if (pl->ob->casting_time > 0)
945 pl->ob->casting_time--; 1046 {
1047 pl->ob->casting_time--;
946 pl->ob->start_holding = 1; 1048 pl->ob->start_holding = 1;
947 } 1049 }
948 /* 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 */
949 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding ==1)){ 1051 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
1052 {
950 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 */
951 } 1058 }
952 }
953 do_some_living(pl->ob);
954/* draw(pl->ob);*/ /* updated in socket code */
955 }
956} 1059}
957 1060
1061void
958void process_players2(mapstruct *map) 1062process_players2 (mapstruct *map)
959{ 1063{
960 player *pl; 1064 player *pl;
961 1065
962 /* 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 */
963 for(pl=first_player;pl!=NULL;pl=pl->next) { 1067 for (pl = first_player; pl != NULL; pl = pl->next)
964 if (map!=NULL) { 1068 {
1069 if (map != NULL)
1070 {
965 if(pl->ob == NULL || QUERY_FLAG(pl->ob,FLAG_REMOVED)) 1071 if (pl->ob == NULL || QUERY_FLAG (pl->ob, FLAG_REMOVED))
966 continue; 1072 continue;
967 else if(pl->loading != NULL) /* Player is blocked */ 1073 else if (pl->loading != NULL) /* Player is blocked */
968 pl->ob->speed_left -= pl->ob->speed; 1074 pl->ob->speed_left -= pl->ob->speed;
969 if (pl->ob->map!=map) continue; 1075 if (pl->ob->map != map)
970 } 1076 continue;
1077 }
971 1078
972 /* 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 -
973 * this isn't called until after the player has finished there 1080 * this isn't called until after the player has finished there
974 * 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
975 * checking. 1082 * checking.
976 */ 1083 */
977 if (pl->has_hit) { 1084 if (pl->has_hit)
978 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;
979 1088
980 /* 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
981 * clear this each tick, but new commands are not being received 1090 * clear this each tick, but new commands are not being received
982 * so execute_newserver_command() is never called 1091 * so execute_newserver_command() is never called
983 */ 1092 */
984 pl->has_hit=0; 1093 pl->has_hit = 0;
985 1094
1095 }
986 } else if (pl->ob->speed_left>pl->ob->speed) 1096 else if (pl->ob->speed_left > pl->ob->speed)
987 pl->ob->speed_left = pl->ob->speed; 1097 pl->ob->speed_left = pl->ob->speed;
988 } 1098 }
989} 1099}
990 1100
991#define SPEED_DEBUG 1101void
992
993
994void process_events (mapstruct *map) 1102process_events (mapstruct *map)
995{ 1103{
996 object *op; 1104 object *op;
1105
997 object marker; 1106 static object *marker;
998 tag_t tag; 1107 if (!marker)
1108 marker = get_object ();
999 1109
1000 process_players1 (map); 1110 process_players1 (map);
1001 1111
1002 memset(&marker, 0, sizeof(object));
1003 /* Put marker object at beginning of active list */
1004 marker.active_next = active_objects; 1112 marker->active_next = active_objects;
1005 1113
1006 if (marker.active_next) 1114 if (marker->active_next)
1007 marker.active_next->active_prev = &marker;
1008 marker.active_prev = NULL;
1009 active_objects = &marker;
1010
1011 while (marker.active_next) {
1012 op = marker.active_next;
1013 tag = op->count;
1014
1015 /* Move marker forward - swap op and marker */
1016 op->active_prev = marker.active_prev;
1017
1018 if (op->active_prev)
1019 op->active_prev->active_next = op;
1020 else
1021 active_objects = op;
1022
1023 marker.active_next = op->active_next;
1024
1025 if (marker.active_next)
1026 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
1027 marker.active_prev = op; 1137 marker->active_prev = op;
1028 op->active_next = &marker; 1138 op->active_next = marker;
1029 1139
1030 /* Now process op */ 1140 /* Now process op */
1031 if (QUERY_FLAG (op, FLAG_FREED)) { 1141 if (QUERY_FLAG (op, FLAG_FREED))
1142 {
1032 LOG (llevError, "BUG: process_events(): Free object on list\n"); 1143 LOG (llevError, "BUG: process_events(): Free object on list\n");
1033 op->speed = 0; 1144 op->speed = 0;
1034 update_ob_speed (op); 1145 update_ob_speed (op);
1035 continue; 1146 continue;
1036 } 1147 }
1037 1148
1038 /* 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,
1039 * 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
1040 * 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
1041 * is probably calling remove_ob without either an insert_ob or 1152 * is probably calling remove_ob without either an insert_ob or
1042 * free_object afterwards, leaving an object dangling. But I'd 1153 * free_object afterwards, leaving an object dangling. But I'd
1043 * rather log this and continue on instead of crashing. 1154 * rather log this and continue on instead of crashing.
1044 * 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
1045 * 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
1046 * around. 1157 * around.
1047 */ 1158 */
1048 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)
1049 op->map && op->map->in_memory != MAP_IN_MEMORY) { 1160 {
1050 LOG (llevError, "BUG: process_events(): Removed object on list\n"); 1161 LOG (llevError, "BUG: process_events(): Removed object on list\n");
1051 dump_object(op); 1162 dump_object (op);
1052 LOG(llevError, errmsg); 1163 LOG (llevError, errmsg);
1053 free_object(op); 1164 free_object (op);
1054 continue; 1165 continue;
1055 } 1166 }
1056 1167
1057 if ( ! op->speed) { 1168 if (!op->speed)
1058 LOG (llevError, "BUG: process_events(): Object %s has no speed, " 1169 {
1059 "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);
1060 update_ob_speed (op); 1171 update_ob_speed (op);
1061 continue; 1172 continue;
1062 } 1173 }
1063 1174
1064 if (op->map == NULL && op->env == NULL && op->name && 1175 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP && map == NULL)
1065 op->type != MAP && map == NULL) { 1176 {
1066 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);
1067 "inventory is on active list: %s (%d)\n",
1068 op->name, op->count);
1069 op->speed = 0; 1178 op->speed = 0;
1070 update_ob_speed (op); 1179 update_ob_speed (op);
1071 continue; 1180 continue;
1072 } 1181 }
1073 1182
1074 if (map != NULL && op->map != map) 1183 if (map != NULL && op->map != map)
1075 continue; 1184 continue;
1076 1185
1077 /* Animate the object. Bug of feature that andim_speed 1186 /* Animate the object. Bug of feature that andim_speed
1078 * is based on ticks, and not the creatures speed? 1187 * is based on ticks, and not the creatures speed?
1079 */ 1188 */
1080 if (op->anim_speed && op->last_anim >= op->anim_speed) 1189 if (op->anim_speed && op->last_anim >= op->anim_speed)
1081 { 1190 {
1082 if ((op->type==PLAYER)||(op->type==MONSTER)) 1191 if ((op->type == PLAYER) || (op->type == MONSTER))
1083 animate_object(op, op->facing); 1192 animate_object (op, op->facing);
1084 else 1193 else
1085 animate_object (op, op->direction); 1194 animate_object (op, op->direction);
1086 1195
1087 op->last_anim = 1; 1196 op->last_anim = 1;
1088 } 1197 }
1089 else 1198 else
1090 op->last_anim++; 1199 op->last_anim++;
1091 1200
1092 if (op->speed_left > 0) { 1201 if (op->speed_left > 0)
1202 {
1093#if 0 1203#if 0
1094 /* I've seen occasional crashes in move_symptom() with it 1204 /* I've seen occasional crashes in move_symptom() with it
1095 * crashing because op is removed - add some debugging to 1205 * crashing because op is removed - add some debugging to
1096 * track if it is removed at this point. 1206 * track if it is removed at this point.
1097 * This unfortunately is a bit too verbose it seems - not sure 1207 * This unfortunately is a bit too verbose it seems - not sure
1098 * 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
1099 * some objects get 'lost' - removed never to be reclaimed. 1209 * some objects get 'lost' - removed never to be reclaimed.
1100 * removed objects generally shouldn't exist. 1210 * removed objects generally shouldn't exist.
1101 */ 1211 */
1102 if (QUERY_FLAG(op, FLAG_REMOVED)) { 1212 if (QUERY_FLAG (op, FLAG_REMOVED))
1213 {
1103 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");
1104 op->name?op->name:"null"); 1215 }
1105 }
1106#endif 1216#endif
1107 --op->speed_left; 1217 --op->speed_left;
1108 process_object (op); 1218 process_object (op);
1109 if (was_destroyed (op, tag)) 1219
1110 continue; 1220 if (op->destroyed ())
1111 } 1221 continue;
1222 }
1223
1112 if (settings.casting_time == TRUE && op->casting_time > 0) 1224 if (settings.casting_time == TRUE && op->casting_time > 0)
1113 op->casting_time--; 1225 op->casting_time--;
1226
1114 if (op->speed_left <= 0) 1227 if (op->speed_left <= 0)
1115 op->speed_left += FABS (op->speed); 1228 op->speed_left += FABS (op->speed);
1116 } 1229 }
1117 1230
1118 /* Remove marker object from active list */ 1231 /* Remove marker object from active list */
1119 if (marker.active_prev != NULL) 1232 if (marker->active_prev != NULL)
1120 marker.active_prev->active_next = NULL; 1233 marker->active_prev->active_next = NULL;
1121 else 1234 else
1122 active_objects = NULL; 1235 active_objects = NULL;
1123 1236
1124 process_players2 (map); 1237 process_players2 (map);
1125} 1238}
1126 1239
1240void
1127void clean_tmp_files(void) { 1241clean_tmp_files (void)
1242{
1128 mapstruct *m, *next; 1243 mapstruct *m, *next;
1129 1244
1130 LOG(llevInfo,"Cleaning up...\n"); 1245 LOG (llevInfo, "Cleaning up...\n");
1131 1246
1132 /* 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
1133 * 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
1134 * just make a special function that only saves the unique items. 1249 * just make a special function that only saves the unique items.
1135 */ 1250 */
1136 for(m=first_map;m!=NULL;m=next) { 1251 for (m = first_map; m != NULL; m = next)
1252 {
1137 next=m->next; 1253 next = m->next;
1138 if (m->in_memory == MAP_IN_MEMORY) { 1254 if (m->in_memory == MAP_IN_MEMORY)
1255 {
1139 /* 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
1140 * 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
1141 * 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
1142 * 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,
1143 * we certainly don't want the temp maps removed. 1260 * we certainly don't want the temp maps removed.
1144 */ 1261 */
1145 1262
1146 /* XXX The above comment is dead wrong */ 1263 /* XXX The above comment is dead wrong */
1147 if (settings.recycle_tmp_maps == TRUE) 1264 if (settings.recycle_tmp_maps == TRUE)
1148 swap_map(m); 1265 swap_map (m);
1149 else { 1266 else
1267 {
1150 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 */
1151 clean_tmp_map(m); 1269 clean_tmp_map (m);
1152 } 1270 }
1153 } 1271 }
1154 } 1272 }
1155 write_todclock(); /* lets just write the clock here */ 1273 write_todclock (); /* lets just write the clock here */
1156} 1274}
1157 1275
1158/* clean up everything before exiting */ 1276/* clean up everything before exiting */
1277void
1159void cleanup(void) 1278cleanup (void)
1160{ 1279{
1161 LOG(llevDebug,"Cleanup called. freeing data.\n"); 1280 LOG (llevDebug, "Cleanup called.\n");
1162 clean_tmp_files();
1163 write_book_archive(); 1281 write_book_archive ();
1164#ifdef MEMORY_DEBUG 1282
1165 free_all_maps(); 1283 INVOKE_GLOBAL (CLEANUP);
1166 free_style_maps(); 1284
1167 free_all_object_data();
1168 free_all_archs();
1169 free_all_treasures();
1170 free_all_images();
1171 free_all_newserver();
1172 free_all_recipes();
1173 free_all_readable();
1174 free_all_god();
1175 free_all_anim();
1176 /* See what the string data that is out there that hasn't been freed. */
1177/* LOG(llevDebug, ss_dump_table(0xff));*/
1178#endif
1179 exit(0); 1285 _exit (0);
1180} 1286}
1181 1287
1288void
1182void leave(player *pl, int draw_exit) { 1289leave (player *pl, int draw_exit)
1290{
1183 if (pl != NULL) { 1291 if (pl != NULL)
1292 {
1184 /* 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
1185 * cleanup. We also leave that loop to actually handle the freeing 1294 * cleanup. We also leave that loop to actually handle the freeing
1186 * of the data. 1295 * of the data.
1187 */ 1296 */
1188 if (pl->ob->type != DEAD_OBJECT) 1297 if (pl->ob->type != DEAD_OBJECT)
1189 { 1298 {
1190 pl->socket.status = Ns_Dead; 1299 pl->socket.status = Ns_Dead;
1191 1300
1192 /* If a hidden dm dropped connection do not create 1301 /* If a hidden dm dropped connection do not create
1193 * inconsistencies by showing that they have left the game 1302 * inconsistencies by showing that they have left the game
1194 */ 1303 */
1195 if (!(QUERY_FLAG(pl->ob,FLAG_WIZ) && pl->ob->contr->hidden) 1304 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
1196 && draw_exit
1197 && (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))
1198 { 1306 {
1199 if (pl->ob->map) 1307 if (pl->ob->map)
1200 { 1308 {
1201 INVOKE_PLAYER (LOGOUT, pl); 1309 INVOKE_PLAYER (LOGOUT, pl);
1202 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);
1203 } 1311 }
1204 1312
1205 char buf[MAX_BUF]; 1313 char buf[MAX_BUF];
1314
1206 sprintf (buf, "%s left the game.", pl->ob->name); 1315 sprintf (buf, "%s left the game.", &pl->ob->name);
1207 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);
1208 } 1317 }
1209 1318
1210 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 1319 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
1211 leave_map (pl->ob); 1320 leave_map (pl->ob);
1212 1321
1213 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */ 1322 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
1214 } 1323 }
1215 } 1324 }
1216} 1325}
1217 1326
1327int
1218int forbid_play(void) 1328forbid_play (void)
1219{ 1329{
1220#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE) 1330#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
1221 char buf[MAX_BUF], day[MAX_BUF]; 1331 char buf[MAX_BUF], day[MAX_BUF];
1222 FILE *fp; 1332 FILE *fp;
1223 time_t clock; 1333 time_t clock;
1224 struct tm *tm; 1334 struct tm *tm;
1225 int i, start, stop, forbit=0, comp; 1335 int i, start, stop, forbit = 0, comp;
1226 1336
1227 clock = time (NULL); 1337 clock = time (NULL);
1228 tm = (struct tm *) localtime (&clock); 1338 tm = (struct tm *) localtime (&clock);
1229 1339
1230 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE); 1340 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
1231 if ((fp = open_and_uncompress(buf, 0, &comp)) == NULL) 1341 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
1232 return 0; 1342 return 0;
1233 1343
1234 while (fgets (buf, MAX_BUF, fp)) { 1344 while (fgets (buf, MAX_BUF, fp))
1235 if (buf[0]=='#') continue; 1345 {
1346 if (buf[0] == '#')
1347 continue;
1236 if (!strncmp (buf, "msg", 3)) { 1348 if (!strncmp (buf, "msg", 3))
1349 {
1237 if (forbit) 1350 if (forbit)
1238 while (fgets (buf, MAX_BUF, fp)) /* print message */ 1351 while (fgets (buf, MAX_BUF, fp)) /* print message */
1239 fputs (buf, logfile); 1352 fputs (buf, logfile);
1240 break; 1353 break;
1241 1354
1355 }
1242 } 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 {
1243 LOG(llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 1358 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
1244 continue; 1359 continue;
1245 } 1360 }
1246 1361
1247 for (i=0; i< 7; i++) { 1362 for (i = 0; i < 7; i++)
1248 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && 1363 {
1249 (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))
1250 forbit = 1; 1365 forbit = 1;
1251 } 1366 }
1252 } 1367 }
1253 1368
1254 close_and_delete(fp, comp); 1369 close_and_delete (fp, comp);
1255 1370
1256 return forbit; 1371 return forbit;
1257#else 1372#else
1258 return 0; 1373 return 0;
1259#endif 1374#endif
1260} 1375}
1261 1376
1262/* 1377/*
1263 * 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.
… …
1273 * doing the various things. 1388 * doing the various things.
1274 */ 1389 */
1275 1390
1276extern unsigned long todtick; 1391extern unsigned long todtick;
1277 1392
1393void
1278void do_specials(void) { 1394do_specials (void)
1395{
1279 1396
1280#ifdef WATCHDOG 1397#ifdef WATCHDOG
1281 if (!(pticks % 503)) 1398 if (!(pticks % 503))
1282 watchdog(); 1399 watchdog ();
1283#endif 1400#endif
1284 1401
1285 if (!(pticks % PTICKS_PER_CLOCK)) 1402 if (!(pticks % PTICKS_PER_CLOCK))
1286 tick_the_clock(); 1403 tick_the_clock ();
1287 1404
1405 if (!(pticks % 7))
1406 shstr::gc ();
1407
1288 if (!(pticks % 509)) 1408 if (!(pticks % 79))
1289 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 */
1290 1410
1291 if (!(pticks % 2503)) 1411 if (!(pticks % 2503))
1292 fix_weight(); /* Hack to fix weightproblems caused by bugs */ 1412 fix_weight (); /* Hack to fix weightproblems caused by bugs */
1293 1413
1294 if (!(pticks % 2521)) 1414 if (!(pticks % 2521))
1295 metaserver_update(); /* 2500 ticks is about 5 minutes */ 1415 metaserver_update (); /* 2500 ticks is about 5 minutes */
1296 1416
1297 if (!(pticks % 5003)) 1417 if (!(pticks % 5003))
1298 write_book_archive(); 1418 write_book_archive ();
1299 1419
1300 if (!(pticks % 5009)) 1420 if (!(pticks % 5009))
1301 clean_friendly_list(); 1421 clean_friendly_list ();
1302 1422
1303 if (!(pticks % 5011)) 1423 if (!(pticks % 5011))
1304 obsolete_parties(); 1424 obsolete_parties ();
1305 1425
1306 if (!(pticks % 12503)) 1426 if (!(pticks % 12503))
1307 fix_luck(); 1427 fix_luck ();
1308} 1428}
1309 1429
1430void
1310void server_tick () 1431server_tick ()
1311{ 1432{
1312 nroferrors = 0; 1433 nroferrors = 0;
1313 1434
1314 doeric_server(); 1435 doeric_server ();
1436 INVOKE_GLOBAL (CLOCK);
1315 process_events(NULL); /* "do" something with objects with speed */ 1437 process_events (NULL); /* "do" something with objects with speed */
1316 cftimer_process_timers();/* Process the crossfire Timers */
1317 /* Lauwenmark : Here we handle the CLOCK global event */
1318 execute_global_event(EVENT_CLOCK);
1319 flush_sockets(); 1438 flush_sockets ();
1320 check_active_maps(); /* Removes unused maps after a certain timeout */ 1439 check_active_maps (); /* Removes unused maps after a certain timeout */
1321 do_specials(); /* Routines called from time to time. */ 1440 do_specials (); /* Routines called from time to time. */
1441 object::free_mortals ();
1322 1442
1323 ++pticks; 1443 ++pticks;
1324} 1444}
1325 1445
1326static void plugin_load_original_map(mapstruct *map) 1446int
1327{
1328 INVOKE_MAP (LOAD, map);
1329}
1330
1331static void plugin_load_temporary_map(mapstruct *map)
1332{
1333 INVOKE_MAP (SWAPIN, map);
1334}
1335
1336static void plugin_clean_temporary_map(mapstruct *map)
1337{
1338 INVOKE_MAP (CLEAN, map);
1339}
1340
1341static void plugin_object_free(object *ob)
1342{
1343 cfperl_free_ob (ob);
1344}
1345
1346int main(int argc, char **argv) 1447main (int argc, char **argv)
1347{ 1448{
1348 settings.argc = argc; 1449 settings.argc = argc;
1349 settings.argv = argv; 1450 settings.argv = argv;
1350 1451
1452 cfperl_init ();
1453
1351 init (argc, argv); 1454 init (argc, argv);
1352 1455
1353 initPlugins (); /* GROS - Init the Plugins */ 1456 initPlugins ();
1354
1355 load_original_map_callback = plugin_load_original_map;
1356 load_temporary_map_callback = plugin_load_temporary_map;
1357 clean_temporary_map_callback = plugin_clean_temporary_map;
1358 object_free_callback = plugin_object_free;
1359
1360 cfperl_init ();
1361 1457
1362 for (;;) 1458 for (;;)
1363 cfperl_main (); 1459 cfperl_main ();
1364 1460
1365 // unreached 1461 // unreached

Diff Legend

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