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.13 by root, Tue Aug 29 07:34:00 2006 UTC vs.
Revision 1.49 by root, Wed Dec 20 09:14:22 2006 UTC

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

Diff Legend

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