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.18 by root, Sun Sep 3 09:00:09 2006 UTC vs.
Revision 1.39 by pippijn, Mon Dec 11 19:46:47 2006 UTC

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

Diff Legend

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