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.2 by root, Tue Aug 15 18:07:25 2006 UTC vs.
Revision 1.42 by root, Wed Dec 13 00:42:04 2006 UTC

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

Diff Legend

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