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

Diff Legend

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