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

Diff Legend

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