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.19 by root, Sun Sep 3 22:45:57 2006 UTC vs.
Revision 1.42 by root, Wed Dec 13 00:42:04 2006 UTC

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

Diff Legend

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