ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/main.C
(Generate patch)

Comparing deliantra/server/server/main.C (file contents):
Revision 1.8 by root, Sun Aug 27 16:15:13 2006 UTC vs.
Revision 1.34 by root, Sat Sep 30 23:48:57 2006 UTC

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

Diff Legend

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