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.5 by root, Thu Aug 24 17:29:30 2006 UTC vs.
Revision 1.47 by root, Mon Dec 18 02:35:01 2006 UTC

1/*
2 * static char *rcsid_main_c =
3 * "$Id: main.C,v 1.5 2006/08/24 17:29:30 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
285 298
299 if (op->map)
300 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr)))
301 return;
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
286 /* 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.
287 * otherwise, we need to deal with removing the playe here. 310 * otherwise, we need to deal with removing the player here.
288 */ 311 */
289 if(!QUERY_FLAG(op, FLAG_REMOVED)) 312 op->remove ();
290 remove_ob(op); 313
291 if (op->map!=NULL)
292 {
293 /* Lauwenmark : Here we handle the MAPLEAVE global event */
294 execute_global_event(EVENT_MAPLEAVE, op);
295 }
296 /* 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 */
297 op->x = x; 315 op->x = x;
298 op->y = y; 316 op->y = y;
299 op->map = newmap; 317 op->map = newmap;
318
300 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);
301 320
302 /* Lauwenmark : Here we handle the MAPENTER global event */
303 execute_global_event(EVENT_MAPENTER, op);
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 472 * Take the last component (after the last slash) to give
449 * shorter names without bogus slashes. 473 * shorter names without bogus slashes.
450 */ 474 */
451 if (rp.final_map[0]) { 475 if (rp.final_map[0])
476 {
452 cp = strrchr(rp.final_map, '/'); 477 cp = strrchr (rp.final_map, '/');
453 if (!cp) cp = rp.final_map; 478 if (!cp)
454 } else { 479 cp = rp.final_map;
480 }
481 else
482 {
455 char buf[HUGE_BUF]; 483 char buf[HUGE_BUF];
456 484
457 cp = strrchr(rp.origin_map, '/'); 485 cp = strrchr (rp.origin_map, '/');
458 if (!cp) cp = rp.origin_map; 486 if (!cp)
487 cp = rp.origin_map;
459 /* Need to strip of any trailing digits, if it has them */ 488 /* Need to strip of any trailing digits, if it has them */
460 strcpy(buf, cp); 489 strcpy (buf, cp);
461 while (isdigit(buf[strlen(buf) - 1])) 490 while (isdigit (buf[strlen (buf) - 1]))
462 buf[strlen(buf) - 1] = 0; 491 buf[strlen (buf) - 1] = 0;
463 cp = buf; 492 cp = buf;
464 } 493 }
465 494
466 sprintf(newmap_name,"/random/%s%04d",cp+1, reference_number++); 495 sprintf (newmap_name, "/random/%s%04d", cp + 1, reference_number++);
467 496
468 /* now to generate the actual map. */ 497 /* now to generate the actual map. */
469 new_map=generate_random_map(newmap_name,&rp); 498 new_map = generate_random_map (newmap_name, &rp);
470 499
471 /* Update the exit_ob so it now points directly at the newly created 500 /* 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 501 * 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. 502 * 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 503 * 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. 504 * the exit leading to it, that the exit will no longer work.
476 */ 505 */
477 if(new_map) { 506 if (new_map)
478 int x, y; 507 {
508 int x, y;
509
479 x=EXIT_X(exit_ob) = MAP_ENTER_X(new_map); 510 x = EXIT_X (exit_ob) = MAP_ENTER_X (new_map);
480 y=EXIT_Y(exit_ob) = MAP_ENTER_Y(new_map); 511 y = EXIT_Y (exit_ob) = MAP_ENTER_Y (new_map);
481 EXIT_PATH(exit_ob) = add_string(newmap_name); 512 EXIT_PATH (exit_ob) = newmap_name;
482 strcpy(new_map->path, newmap_name); 513 strcpy (new_map->path, newmap_name);
483 enter_map(pl, new_map, x, y); 514 enter_map (pl, new_map, x, y);
484 } 515 }
485} 516}
486 517
487/* The player is trying to enter a non-randomly generated template map. In this 518/* The player is trying to enter a non-randomly generated template map. In this
488 * case, use a map file for a template 519 * case, use a map file for a template
489 */ 520 */
490 521
522static void
491static void enter_fixed_template_map(object *pl, object *exit_ob) 523enter_fixed_template_map (object *pl, object *exit_ob)
492{ 524{
493 mapstruct *new_map; 525 maptile *new_map;
494 char tmpnum[32], exitpath[HUGE_BUF], resultname[HUGE_BUF], tmpstring[HUGE_BUF], *sourcemap; 526 char tmpnum[32], exitpath[HUGE_BUF], resultname[HUGE_BUF], tmpstring[HUGE_BUF], *sourcemap;
495 const char *new_map_name; 527 const char *new_map_name;
496 528
497 /* Split the exit path string into two parts, one 529 /* Split the exit path string into two parts, one
498 * for where to store the map, and one for were 530 * for where to store the map, and one for were
499 * to generate the map from. 531 * to generate the map from.
500 */ 532 */
501 snprintf(exitpath, sizeof(exitpath), "%s", EXIT_PATH(exit_ob)+2); 533 snprintf (exitpath, sizeof (exitpath), "%s", EXIT_PATH (exit_ob) + 2);
502 sourcemap = strchr(exitpath, '!'); 534 sourcemap = strchr (exitpath, '!');
503 if (!sourcemap) { 535 if (!sourcemap)
536 {
504 new_draw_info_format(NDI_UNIQUE, 0, pl, "The %s is closed.", exit_ob->name); 537 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. 538 /* Should only occur when no source map is set.
506 */ 539 */
507 LOG(llevError,"enter_fixed_template_map: Exit %s (%d,%d) on map %s has no source template.\n", 540 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); 541 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
509 return; 542 return;
510 } 543 }
544
511 *sourcemap++ = '\0'; 545 *sourcemap++ = '\0';
512 546
513 /* If we are not coming from a template map, we can use relative directories 547 /* If we are not coming from a template map, we can use relative directories
514 * for the map to generate from. 548 * for the map to generate from.
515 */ 549 */
516 if (!exit_ob->map->templatemap) { 550 if (!exit_ob->map->templatemap)
517 sourcemap = path_combine_and_normalize(exit_ob->map->path, sourcemap); 551 sourcemap = path_combine_and_normalize (exit_ob->map->path, sourcemap);
518 } 552
519
520 /* Do replacement of %x, %y, and %n to the x coord of the exit, the y coord 553 /* 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. 554 * of the exit, and the name of the map the exit is on, respectively.
522 */ 555 */
523 sprintf(tmpnum ,"%d", exit_ob->x); 556 sprintf (tmpnum, "%d", exit_ob->x);
524 replace(exitpath, "%x", tmpnum, resultname, sizeof(resultname)); 557 replace (exitpath, "%x", tmpnum, resultname, sizeof (resultname));
525 558
526 sprintf(tmpnum ,"%d", exit_ob->y); 559 sprintf (tmpnum, "%d", exit_ob->y);
527 sprintf(tmpstring, "%s", resultname); 560 sprintf (tmpstring, "%s", resultname);
528 replace(tmpstring, "%y", tmpnum, resultname, sizeof(resultname)); 561 replace (tmpstring, "%y", tmpnum, resultname, sizeof (resultname));
529 562
530 sprintf(tmpstring, "%s", resultname); 563 sprintf (tmpstring, "%s", resultname);
531 replace(tmpstring, "%n", exit_ob->map->name, resultname, sizeof(resultname)); 564 replace (tmpstring, "%n", exit_ob->map->name, resultname, sizeof (resultname));
532 565
533 /* If we are coming from another template map, use reletive paths unless 566 /* If we are coming from another template map, use reletive paths unless
534 * indicated otherwise. 567 * indicated otherwise.
535 */ 568 */
536 if (exit_ob->map->templatemap && (resultname[0] != '/')) { 569 if (exit_ob->map->templatemap && (resultname[0] != '/'))
537 new_map_name = path_combine_and_normalize(exit_ob->map->path, resultname); 570 new_map_name = path_combine_and_normalize (exit_ob->map->path, resultname);
538 } else { 571 else
539 new_map_name = create_template_pathname(resultname); 572 new_map_name = create_template_pathname (resultname);
540 } 573
541
542 /* Attempt to load the map, if unable to, then 574 /* Attempt to load the map, if unable to, then
543 * create the map from the template. 575 * create the map from the template.
544 */ 576 */
545 new_map = ready_map_name(new_map_name, MAP_PLAYER_UNIQUE); 577 new_map = ready_map_name (new_map_name, MAP_PLAYER_UNIQUE);
546 if (!new_map) { 578 if (!new_map)
579 {
547 new_map = load_original_map(create_pathname(sourcemap), MAP_PLAYER_UNIQUE); 580 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) { 581 if (new_map)
582 fix_auto_apply (new_map);
583 }
584
585 if (new_map)
586 {
552 /* set the path of the map to where it should be 587 /* set the path of the map to where it should be
553 * so we don't just save over the source map. 588 * so we don't just save over the source map.
554 */ 589 */
555 strcpy(new_map->path, new_map_name); 590 strcpy (new_map->path, new_map_name);
556 new_map->templatemap = 1; 591 new_map->templatemap = 1;
557 enter_map(pl, new_map, EXIT_X(exit_ob), EXIT_Y(exit_ob)); 592 enter_map (pl, new_map, EXIT_X (exit_ob), EXIT_Y (exit_ob));
558 } else { 593 }
594 else
595 {
559 new_draw_info_format(NDI_UNIQUE, 0, pl, "The %s is closed.", exit_ob->name); 596 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. 597 /* Should only occur when an invalid source map is set.
561 */ 598 */
562 LOG(llevDebug,"enter_fixed_template_map: Exit %s (%d,%d) on map %s leads no where.\n", 599 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); 600 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
564 } 601 }
565} 602}
566
567 603
568/* The player is trying to enter a randomly generated template map. In this 604/* The player is trying to enter a randomly generated template map. In this
569 * case, generate the map as needed. 605 * case, generate the map as needed.
570 */ 606 */
571 607
608static void
572static void enter_random_template_map(object *pl, object *exit_ob) 609enter_random_template_map (object *pl, object *exit_ob)
573{ 610{
574 mapstruct *new_map; 611 maptile *new_map;
575 char tmpnum[32], resultname[HUGE_BUF], tmpstring[HUGE_BUF]; 612 char tmpnum[32], resultname[HUGE_BUF], tmpstring[HUGE_BUF];
576 const char *new_map_name; 613 const char *new_map_name;
577 RMParms rp; 614 RMParms rp;
578 615
579 /* Do replacement of %x, %y, and %n to the x coord of the exit, the y coord 616 /* 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. 617 * of the exit, and the name of the map the exit is on, respectively.
581 */ 618 */
582 sprintf(tmpnum ,"%d", exit_ob->x); 619 sprintf (tmpnum, "%d", exit_ob->x);
583 replace(EXIT_PATH(exit_ob)+3, "%x", tmpnum, resultname, sizeof(resultname)); 620 replace (EXIT_PATH (exit_ob) + 3, "%x", tmpnum, resultname, sizeof (resultname));
584 621
585 sprintf(tmpnum ,"%d", exit_ob->y); 622 sprintf (tmpnum, "%d", exit_ob->y);
586 sprintf(tmpstring, "%s", resultname); 623 sprintf (tmpstring, "%s", resultname);
587 replace(tmpstring, "%y", tmpnum, resultname, sizeof(resultname)); 624 replace (tmpstring, "%y", tmpnum, resultname, sizeof (resultname));
588 625
589 sprintf(tmpstring, "%s", resultname); 626 sprintf (tmpstring, "%s", resultname);
590 replace(tmpstring, "%n", exit_ob->map->name, resultname, sizeof(resultname)); 627 replace (tmpstring, "%n", exit_ob->map->name, resultname, sizeof (resultname));
591 628
592 /* If we are coming from another template map, use reletive paths unless 629 /* If we are coming from another template map, use reletive paths unless
593 * indicated otherwise. 630 * indicated otherwise.
594 */ 631 */
595 if (exit_ob->map->templatemap && (resultname[0] != '/')) { 632 if (exit_ob->map->templatemap && (resultname[0] != '/'))
633 {
596 new_map_name = path_combine_and_normalize(exit_ob->map->path, resultname); 634 new_map_name = path_combine_and_normalize (exit_ob->map->path, resultname);
597 } else { 635 }
636 else
637 {
598 new_map_name = create_template_pathname(resultname); 638 new_map_name = create_template_pathname (resultname);
599 } 639 }
600 640
601 new_map = ready_map_name(new_map_name, MAP_PLAYER_UNIQUE); 641 new_map = ready_map_name (new_map_name, MAP_PLAYER_UNIQUE);
602 if (!new_map) { 642 if (!new_map)
643 {
603 memset(&rp, 0, sizeof(RMParms)); 644 memset (&rp, 0, sizeof (RMParms));
604 rp.Xsize=-1; 645 rp.Xsize = -1;
605 rp.Ysize=-1; 646 rp.Ysize = -1;
606 rp.region=get_region_by_map(exit_ob->map); 647 rp.region = get_region_by_map (exit_ob->map);
648 if (exit_ob->msg)
607 if (exit_ob->msg) set_random_map_variable(&rp,exit_ob->msg); 649 set_random_map_variable (&rp, exit_ob->msg);
608 rp.origin_x = exit_ob->x; 650 rp.origin_x = exit_ob->x;
609 rp.origin_y = exit_ob->y; 651 rp.origin_y = exit_ob->y;
610 strcpy(rp.origin_map, pl->map->path); 652 strcpy (rp.origin_map, pl->map->path);
611 653
612 /* now to generate the actual map. */ 654 /* now to generate the actual map. */
613 new_map=generate_random_map(new_map_name,&rp); 655 new_map = generate_random_map (new_map_name, &rp);
614 } 656 }
615 657
616 658
617 /* Update the exit_ob so it now points directly at the newly created 659 /* 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 660 * 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. 661 * 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 662 * 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. 663 * the exit leading to it, that the exit will no longer work.
622 */ 664 */
623 if(new_map) { 665 if (new_map)
624 int x, y; 666 {
667 int x, y;
668
625 x=EXIT_X(exit_ob) = MAP_ENTER_X(new_map); 669 x = EXIT_X (exit_ob) = MAP_ENTER_X (new_map);
626 y=EXIT_Y(exit_ob) = MAP_ENTER_Y(new_map); 670 y = EXIT_Y (exit_ob) = MAP_ENTER_Y (new_map);
627 new_map->templatemap = 1; 671 new_map->templatemap = 1;
628 enter_map(pl, new_map, x, y); 672 enter_map (pl, new_map, x, y);
629 } 673 }
630} 674}
631 675
632 676
633/* Code to enter/detect a character entering a unique map. 677/* Code to enter/detect a character entering a unique map.
634 */ 678 */
679static void
635static void enter_unique_map(object *op, object *exit_ob) 680enter_unique_map (object *op, object *exit_ob)
636{ 681{
637 char apartment[HUGE_BUF]; 682 char apartment[HUGE_BUF];
638 mapstruct *newmap; 683 maptile *newmap;
639 684
640 if (EXIT_PATH(exit_ob)[0]=='/') { 685 if (EXIT_PATH (exit_ob)[0] == '/')
641 sprintf(apartment, "%s/%s/%s/%s", settings.localdir, 686 {
642 settings.playerdir, op->name, clean_path(EXIT_PATH(exit_ob))); 687 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); 688 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
665 if (!newmap) { 689 if (!newmap)
690 {
691 newmap = load_original_map (create_pathname (EXIT_PATH (exit_ob)), MAP_PLAYER_UNIQUE);
692 if (newmap)
693 fix_auto_apply (newmap);
694 }
695 }
696 else
697 { /* relative directory */
698 char reldir[HUGE_BUF], tmpc[HUGE_BUF], *cp;
699
700 if (exit_ob->map->unique)
701 {
702
703 strcpy (reldir, unclean_path (exit_ob->map->path));
704
705 /* Need to copy this over, as clean_path only has one static return buffer */
706 strcpy (tmpc, clean_path (reldir));
707 /* Remove final component, if any */
708 if ((cp = strrchr (tmpc, '_')) != NULL)
709 *cp = 0;
710
711 sprintf (apartment, "%s/%s/%s/%s_%s", settings.localdir, settings.playerdir, &op->name, tmpc, clean_path (EXIT_PATH (exit_ob)));
712
713 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
714 if (!newmap)
715 {
666 newmap = load_original_map(create_pathname(path_combine_and_normalize(reldir, EXIT_PATH(exit_ob))), MAP_PLAYER_UNIQUE); 716 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); 717 if (newmap)
668 } 718 fix_auto_apply (newmap);
669 } 719 }
670 else { 720 }
721 else
722 {
671 /* The exit is unique, but the map we are coming from is not unique. So 723 /* 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 724 * use the basic logic - don't need to demangle the path name
673 */ 725 */
674 sprintf(apartment, "%s/%s/%s/%s", settings.localdir, 726 sprintf (apartment, "%s/%s/%s/%s", settings.localdir,
675 settings.playerdir, op->name, 727 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); 728 newmap = ready_map_name (apartment, MAP_PLAYER_UNIQUE);
678 if (!newmap) { 729 if (!newmap)
730 {
679 newmap = ready_map_name(path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob)), 0); 731 newmap = ready_map_name (path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)), 0);
680 if (newmap) fix_auto_apply(newmap); 732 if (newmap)
733 fix_auto_apply (newmap);
734 }
735 }
681 } 736 }
682 }
683 }
684 737
685 if (newmap) { 738 if (newmap)
739 {
686 strcpy(newmap->path, apartment); 740 strcpy (newmap->path, apartment);
687 newmap->unique = 1; 741 newmap->unique = 1;
688 enter_map(op, newmap, EXIT_X(exit_ob), EXIT_Y(exit_ob)); 742 enter_map (op, newmap, EXIT_X (exit_ob), EXIT_Y (exit_ob));
689 } else { 743 }
744 else
745 {
690 new_draw_info_format(NDI_UNIQUE, 0, op, "The %s is closed.", exit_ob->name); 746 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 747 /* Perhaps not critical, but I would think that the unique maps
692 * should be new enough this does not happen. This also creates 748 * should be new enough this does not happen. This also creates
693 * a strange situation where some players could perhaps have visited 749 * a strange situation where some players could perhaps have visited
694 * such a map before it was removed, so they have the private 750 * such a map before it was removed, so they have the private
695 * map, but other players can't get it anymore. 751 * map, but other players can't get it anymore.
696 */ 752 */
697 LOG(llevDebug,"enter_unique_map: Exit %s (%d,%d) on map %s is leads no where.\n", 753 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); 754 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);
699 } 755 }
700 756
701} 757}
702 758
703 759
704/* Tries to move 'op' to exit_ob. op is the character or monster that is 760/* 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, 761 * using the exit, where exit_ob is the exit object (boat, door, teleporter,
… …
708 * 764 *
709 * Largely redone by MSW 2001-01-21 - this function was overly complex 765 * Largely redone by MSW 2001-01-21 - this function was overly complex
710 * and had some obscure bugs. 766 * and had some obscure bugs.
711 */ 767 */
712 768
769void
713void enter_exit(object *op, object *exit_ob) { 770enter_exit (object *op, object *exit_ob)
771{
714 #define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */ 772#define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */
715 object *tmp; 773 object *tmp;
774
716 /* It may be nice to support other creatures moving across 775 /* It may be nice to support other creatures moving across
717 * exits, but right now a lot of the code looks at op->contr, 776 * exits, but right now a lot of the code looks at op->contr,
718 * so thta is an RFE. 777 * so that is an RFE.
719 */ 778 */
720 if (op->type != PLAYER) return; 779 if (op->type != PLAYER)
780 return;
721 781
722 /* Need to remove player from transport */
723 if (op->contr->transport) apply_transport(op, op->contr->transport, AP_UNAPPLY);
724
725 /* First, lets figure out what map the player is going to go to */ 782 /* First, lets figure out what map the player is going to go to */
726 if (exit_ob){ 783 if (exit_ob)
727 784 {
728 /* check to see if we make a template map */ 785 /* check to see if we make a template map */
729 if(EXIT_PATH(exit_ob)&&EXIT_PATH(exit_ob)[1]=='@') { 786 if (EXIT_PATH (exit_ob) && EXIT_PATH (exit_ob)[1] == '@')
787 {
730 if (EXIT_PATH(exit_ob)[2]=='!') { 788 if (EXIT_PATH (exit_ob)[2] == '!')
789 {
731 /* generate a template map randomly */ 790 /* generate a template map randomly */
732 enter_random_template_map(op, exit_ob); 791 enter_random_template_map (op, exit_ob);
733 } else {
734 /* generate a template map from a fixed template */
735 enter_fixed_template_map(op, exit_ob);
736 } 792 }
737 } 793 else
794 {
795 /* generate a template map from a fixed template */
796 enter_fixed_template_map (op, exit_ob);
797 }
798 }
738 /* check to see if we make a randomly generated map */ 799 /* check to see if we make a randomly generated map */
739 else if(EXIT_PATH(exit_ob)&&EXIT_PATH(exit_ob)[1]=='!') { 800 else if (EXIT_PATH (exit_ob) && EXIT_PATH (exit_ob)[1] == '!')
801 {
740 enter_random_map(op, exit_ob); 802 enter_random_map (op, exit_ob);
741 } 803 }
742 else if (QUERY_FLAG(exit_ob, FLAG_UNIQUE)) { 804 else if (QUERY_FLAG (exit_ob, FLAG_UNIQUE))
805 {
743 enter_unique_map(op, exit_ob); 806 enter_unique_map (op, exit_ob);
744 } else { 807 }
808 else
809 {
745 int x=EXIT_X(exit_ob), y=EXIT_Y(exit_ob); 810 int x = EXIT_X (exit_ob), y = EXIT_Y (exit_ob);
811
746 /* 'Normal' exits that do not do anything special 812 /* 'Normal' exits that do not do anything special
747 * Simple enough we don't need another routine for it. 813 * Simple enough we don't need another routine for it.
748 */ 814 */
749 mapstruct *newmap; 815 maptile *newmap;
816
750 if (exit_ob->map) { 817 if (exit_ob->map)
818 {
751 newmap = ready_map_name(path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob)), 0); 819 newmap = ready_map_name (path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)), 0);
752 /* Random map was previously generated, but is no longer about. Lets generate a new 820 /* Random map was previously generated, but is no longer about. Lets generate a new
753 * map. 821 * map.
754 */ 822 */
755 if (!newmap && !strncmp(EXIT_PATH(exit_ob),"/random/",8)) { 823 if (!newmap && !strncmp (EXIT_PATH (exit_ob), "/random/", 8))
824 {
756 /* Maps that go down have a message set. However, maps that go 825 /* Maps that go down have a message set. However, maps that go
757 * up, don't. If the going home has reset, there isn't much 826 * up, don't. If the going home has reset, there isn't much
758 * point generating a random map, because it won't match the maps. 827 * point generating a random map, because it won't match the maps.
759 */ 828 */
760 if (exit_ob->msg) {
761 enter_random_map(op, exit_ob);
762 } else {
763 new_draw_info_format(NDI_UNIQUE, 0, op, "The %s is closed.", exit_ob->name);
764 return;
765 }
766
767 /* For exits that cause damages (like pits). Don't know if any
768 * random maps use this or not.
769 */
770 if(exit_ob->stats.dam && op->type==PLAYER)
771 hit_player(op,exit_ob->stats.dam,exit_ob,exit_ob->attacktype,1);
772 return;
773 }
774 } else {
775 /* For word of recall and other force objects
776 * They contain the full pathname of the map to go back to,
777 * so we don't need to normalize it.
778 * But we do need to see if it is unique or not
779 */
780 if (!strncmp(EXIT_PATH(exit_ob), settings.localdir, strlen(settings.localdir)))
781 newmap = ready_map_name(EXIT_PATH(exit_ob), MAP_PLAYER_UNIQUE);
782 else
783 newmap = ready_map_name(EXIT_PATH(exit_ob), 0);
784 }
785 if (!newmap)
786 {
787 if (exit_ob->name) 829 if (exit_ob->msg)
830 {
831 enter_random_map (op, exit_ob);
832 }
833 else
834 {
788 new_draw_info_format(NDI_UNIQUE, 0, op, "The %s is closed.", exit_ob->name); 835 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", &exit_ob->name);
836 return;
837 }
838
839 /* For exits that cause damages (like pits). Don't know if any
840 * random maps use this or not.
841 */
842 if (exit_ob->stats.dam && op->type == PLAYER)
843 hit_player (op, exit_ob->stats.dam, exit_ob, exit_ob->attacktype, 1);
844 return;
845 }
846 }
847 else
848 {
849 /* For word of recall and other force objects
850 * They contain the full pathname of the map to go back to,
851 * so we don't need to normalize it.
852 * But we do need to see if it is unique or not
853 */
854 if (!strncmp (EXIT_PATH (exit_ob), settings.localdir, strlen (settings.localdir)))
855 newmap = ready_map_name (EXIT_PATH (exit_ob), MAP_PLAYER_UNIQUE);
856 else
857 newmap = ready_map_name (EXIT_PATH (exit_ob), 0);
858 }
859 if (!newmap)
860 {
861 if (exit_ob->name)
862 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", &exit_ob->name);
789 /* don't cry to momma if name is not set - as in tmp objects 863 /* don't cry to momma if name is not set - as in tmp objects
790 * used by the savebed code and character creation */ 864 * used by the savebed code and character creation */
791 return; 865 return;
792 } 866 }
793 867
794 /* This supports the old behaviour, but it really should not be used. 868 /* This supports the old behaviour, but it really should not be used.
795 * I will note for example that with this method, it is impossible to 869 * I will note for example that with this method, it is impossible to
796 * set 0,0 destination coordinates. Really, if we want to support 870 * set 0,0 destination coordinates. Really, if we want to support
797 * using the new maps default coordinates, the exit ob should use 871 * using the new maps default coordinates, the exit ob should use
798 * something like -1, -1 so it is clear to do that. 872 * something like -1, -1 so it is clear to do that.
799 */ 873 */
800 if (x==0 && y==0) { 874 if (x == 0 && y == 0)
801 x=MAP_ENTER_X(newmap); 875 {
802 y=MAP_ENTER_Y(newmap); 876 x = MAP_ENTER_X (newmap);
877 y = MAP_ENTER_Y (newmap);
803 LOG(llevDebug,"enter_exit: Exit %s (%d,%d) on map %s is 0 destination coordinates\n", 878 LOG (llevDebug, "enter_exit: Exit %s (%d,%d) on map %s is 0 destination coordinates\n",
804 exit_ob->name?exit_ob->name:"(none)", exit_ob->x, exit_ob->y, 879 &exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map ? exit_ob->map->path : "<nil>");
805 exit_ob->map?exit_ob->map->path:"(none)"); 880 }
806 }
807 881
808 /* mids 02/13/2002 if exit is damned, update players death & WoR home-position and delete town portal */ 882 /* mids 02/13/2002 if exit is damned, update players death & WoR home-position and delete town portal */
809 if (QUERY_FLAG(exit_ob, FLAG_DAMNED)) { 883 if (QUERY_FLAG (exit_ob, FLAG_DAMNED))
884 {
810 /* remove an old force with a slaying field == PORTAL_DESTINATION_NAME */ 885 /* remove an old force with a slaying field == PORTAL_DESTINATION_NAME */
811 for(tmp=op->inv; tmp != NULL; tmp = tmp->below) { 886 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
887 {
812 if(tmp->type == FORCE && tmp->slaying && !strcmp(tmp->slaying, PORTAL_DESTINATION_NAME)) break; 888 if (tmp->type == FORCE && tmp->slaying && !strcmp (tmp->slaying, PORTAL_DESTINATION_NAME))
889 break;
813 } 890 }
814 if(tmp) { 891 if (tmp)
892 {
815 remove_ob(tmp); 893 tmp->remove ();
816 free_object(tmp); 894 tmp->destroy ();
817 } 895 }
818 896
819 strcpy(op->contr->savebed_map, path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob))); 897 strcpy (op->contr->savebed_map, path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)));
820 op->contr->bed_x = EXIT_X(exit_ob), op->contr->bed_y = EXIT_Y(exit_ob); 898 op->contr->bed_x = EXIT_X (exit_ob), op->contr->bed_y = EXIT_Y (exit_ob);
821 save_player(op, 1); 899 save_player (op, 1);
822 /* LOG(llevDebug,"enter_exit: Taking damned exit %s to (%d,%d) on map %s\n", 900 /* LOG(llevDebug,"enter_exit: Taking damned exit %s to (%d,%d) on map %s\n",
823 * exit_ob->name?exit_ob->name:"(none)", exit_ob->x, exit_ob->y, 901 * exit_ob->name?exit_ob->name:"(none)", exit_ob->x, exit_ob->y,
824 * path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob))); */ 902 * path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob))); */
825 } 903 }
826 904
827 enter_map(op, newmap, x, y); 905 enter_map (op, newmap, x, y);
828 } 906 }
829 /* For exits that cause damages (like pits) */ 907 /* For exits that cause damages (like pits) */
830 if(exit_ob->stats.dam && op->type==PLAYER) 908 if (exit_ob->stats.dam && op->type == PLAYER)
831 hit_player(op,exit_ob->stats.dam,exit_ob,exit_ob->attacktype,1); 909 hit_player (op, exit_ob->stats.dam, exit_ob, exit_ob->attacktype, 1);
832 } else { 910 }
911 else
912 {
833 int flags = 0; 913 int flags = 0;
834 mapstruct *newmap; 914 maptile *newmap;
835 915
836
837 /* Hypothetically, I guess its possible that a standard map matches 916 /* Hypothetically, I guess its possible that a standard map matches
838 * the localdir, but that seems pretty unlikely - unlikely enough that 917 * the localdir, but that seems pretty unlikely - unlikely enough that
839 * I'm not going to attempt to try to deal with that possibility. 918 * I'm not going to attempt to try to deal with that possibility.
840 * We use the fact that when a player saves on a unique map, it prepends 919 * We use the fact that when a player saves on a unique map, it prepends
841 * the localdir to that name. So its an easy way to see of the map is 920 * the localdir to that name. So its an easy way to see of the map is
842 * unique or not. 921 * unique or not.
843 */ 922 */
844 if (!strncmp(op->contr->maplevel, settings.localdir, strlen(settings.localdir))) 923 if (!strncmp (op->contr->maplevel, settings.localdir, strlen (settings.localdir)))
845 flags = MAP_PLAYER_UNIQUE; 924 flags = MAP_PLAYER_UNIQUE;
846 925
847 /* newmap returns the map (if already loaded), or loads it for 926 /* newmap returns the map (if already loaded), or loads it for
848 * us. 927 * us.
849 */ 928 */
850 newmap = ready_map_name(op->contr->maplevel, flags); 929 newmap = ready_map_name (op->contr->maplevel, flags);
851 if (!newmap) 930 if (!newmap)
852 { 931 {
853 LOG(llevError,
854 "enter_exit: Pathname to map does not exist! (%s)\n", 932 LOG (llevError, "enter_exit: Pathname to map does not exist! (%s)\n", op->contr->maplevel);
855 op->contr->maplevel);
856 newmap = ready_map_name(settings.emergency_mapname, 0); 933 newmap = ready_map_name (settings.emergency_mapname, 0);
857 op->x = settings.emergency_x; 934 op->x = settings.emergency_x;
858 op->y = settings.emergency_y; 935 op->y = settings.emergency_y;
859 /* If we can't load the emergency map, something is probably really 936 /* If we can't load the emergency map, something is probably really
860 * screwed up, so bail out now. 937 * screwed up, so bail out now.
861 */ 938 */
862 if (!newmap) { 939 if (!newmap)
940 {
863 LOG(llevError,"enter_exit: could not load emergency map? Fatal error\n"); 941 LOG (llevError, "enter_exit: could not load emergency map? Fatal error\n");
864 abort(); 942 abort ();
943 }
944 }
945
946 enter_map (op, newmap, op->x, op->y);
865 } 947 }
866 }
867 enter_map(op, newmap, op->x, op->y);
868 }
869} 948}
870
871/*
872 * process_active_maps(): Works like process_events(), but it only
873 * processes maps which a player is on.
874 *
875 */
876
877#if 0 // dead code, schmorp
878void process_active_maps ()
879{
880 for (mapstruct *map = first_map; map != NULL; map = map->next)
881 if (map->in_memory == MAP_IN_MEMORY)
882 if (players_on_map (map, TRUE))
883 process_events (map);
884}
885#endif
886 949
887/* process_players1 and process_players2 do all the player related stuff. 950/* process_players1 and process_players2 do all the player related stuff.
888 * I moved it out of process events and process_map. This was to some 951 * I moved it out of process events and process_map. This was to some
889 * extent for debugging as well as to get a better idea of the time used 952 * extent for debugging as well as to get a better idea of the time used
890 * by the various functions. process_players1() does the processing before 953 * by the various functions. process_players1() does the processing before
891 * objects have been updated, process_players2() does the processing that 954 * objects have been updated, process_players2() does the processing that
892 * is needed after the players have been updated. 955 * is needed after the players have been updated.
893 */ 956 */
894 957static void
895void process_players1(mapstruct *map) 958process_players1 ()
896{ 959{
897 int flag; 960 int flag;
898 player *pl,*plnext;
899
900 /* Basically, we keep looping until all the players have done their actions. */ 961 /* Basically, we keep looping until all the players have done their actions. */
901 for(flag=1;flag!=0;) { 962 for (flag = 1; flag != 0;)
902 flag=0; 963 {
903 for(pl=first_player;pl!=NULL;pl=plnext) { 964 flag = 0;
965 for (player *plnext, *pl = first_player; pl; pl = plnext)
966 {
904 plnext=pl->next; /* In case a player exits the game in handle_player() */ 967 plnext = pl->next; /* In case a player exits the game in handle_player() */
905 968
906 if (pl->ob == NULL) continue; 969 if (!pl->ob)
970 continue;
907 971
908 if (map!=NULL && pl->ob->map!=map) continue;
909
910 if(pl->ob->speed_left>0) { 972 if (pl->ob->speed_left > 0)
973 {
911 if (handle_newcs_player(pl->ob)) 974 if (handle_newcs_player (pl->ob))
912 flag=1; 975 flag = 1;
913 } /* end if player has speed left */ 976 } /* end if player has speed left */
914 977
915 /* If the player is not actively playing, don't make a 978 /* If the player is not actively playing, don't make a
916 * backup save - nothing to save anyway. Plus, the 979 * backup save - nothing to save anyway. Plus, the
917 * map may not longer be valid. This can happen when the 980 * map may not longer be valid. This can happen when the
918 * player quits - they exist for purposes of tracking on the map, 981 * player quits - they exist for purposes of tracking on the map,
919 * but don't actually reside on any actual map. 982 * but don't actually reside on any actual map.
920 */ 983 */
921 if (QUERY_FLAG(pl->ob, FLAG_REMOVED)) continue; 984 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
985 continue;
922 986
923#ifdef AUTOSAVE 987#ifdef AUTOSAVE
924 /* check for ST_PLAYING state so that we don't try to save off when 988 /* check for ST_PLAYING state so that we don't try to save off when
925 * the player is logging in. 989 * the player is logging in.
926 */ 990 */
927 if ((pl->last_save_tick+AUTOSAVE)<pticks && pl->state==ST_PLAYING) { 991 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->state == ST_PLAYING)
928 /* Don't save the player on unholy ground. Instead, increase the 992 {
929 * tick time so it will be about 10 seconds before we try and save
930 * again.
931 */
932// if (get_map_flags(pl->ob->map, NULL, pl->ob->x, pl->ob->y, NULL, NULL) & P_NO_CLERIC) {
933// pl->last_save_tick += 100;
934// } else {
935 save_player(pl->ob,1); 993 save_player (pl->ob, 1);
936 pl->last_save_tick = pticks; 994 pl->last_save_tick = pticks;
937// } 995 }
938 }
939#endif 996#endif
940 } /* end of for loop for all the players */ 997 } /* end of for loop for all the players */
941 } /* for flag */ 998 } /* for flag */
942 for(pl=first_player;pl!=NULL;pl=pl->next) { 999
943 if (map!=NULL && (pl->ob == NULL || pl->ob->map!=map)) 1000 for (player *pl = first_player; pl; pl = pl->next)
944 continue; 1001 {
945 if (settings.casting_time == TRUE) { 1002 if (settings.casting_time)
1003 {
946 if (pl->ob->casting_time > 0){ 1004 if (pl->ob->casting_time > 0)
947 pl->ob->casting_time--; 1005 {
1006 pl->ob->casting_time--;
948 pl->ob->start_holding = 1; 1007 pl->ob->start_holding = 1;
949 } 1008 }
1009
950 /* set spell_state so we can update the range in stats field */ 1010 /* set spell_state so we can update the range in stats field */
951 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding ==1)){ 1011 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
952 pl->ob->start_holding = 0; 1012 pl->ob->start_holding = 0;
1013 }
1014
1015 do_some_living (pl->ob);
953 } 1016 }
954 }
955 do_some_living(pl->ob);
956/* draw(pl->ob);*/ /* updated in socket code */
957 }
958} 1017}
959 1018
960void process_players2(mapstruct *map) 1019static void
1020process_players2 ()
961{ 1021{
962 player *pl;
963
964 /* Then check if any players should use weapon-speed instead of speed */ 1022 /* Then check if any players should use weapon-speed instead of speed */
965 for(pl=first_player;pl!=NULL;pl=pl->next) { 1023 for (player *pl = first_player; pl; pl = pl->next)
966 if (map!=NULL) { 1024 {
967 if(pl->ob == NULL || QUERY_FLAG(pl->ob,FLAG_REMOVED))
968 continue;
969 else if(pl->loading != NULL) /* Player is blocked */
970 pl->ob->speed_left -= pl->ob->speed;
971 if (pl->ob->map!=map) continue;
972 }
973
974 /* The code that did weapon_sp handling here was out of place - 1025 /* The code that did weapon_sp handling here was out of place -
975 * this isn't called until after the player has finished there 1026 * this isn't called until after the player has finished there
976 * actions, and is thus out of place. All we do here is bounds 1027 * actions, and is thus out of place. All we do here is bounds
977 * checking. 1028 * checking.
978 */ 1029 */
979 if (pl->has_hit) { 1030 if (pl->has_hit)
980 if (pl->ob->speed_left > pl->weapon_sp) pl->ob->speed_left = pl->weapon_sp; 1031 {
1032 if (pl->ob->speed_left > pl->weapon_sp)
1033 pl->ob->speed_left = pl->weapon_sp;
981 1034
982 /* This needs to be here - if the player is running, we need to 1035 /* This needs to be here - if the player is running, we need to
983 * clear this each tick, but new commands are not being received 1036 * clear this each tick, but new commands are not being received
984 * so execute_newserver_command() is never called 1037 * so execute_newserver_command() is never called
985 */ 1038 */
986 pl->has_hit=0; 1039 pl->has_hit = 0;
987 1040 }
988 } else if (pl->ob->speed_left>pl->ob->speed) 1041 else if (pl->ob->speed_left > pl->ob->speed)
989 pl->ob->speed_left = pl->ob->speed; 1042 pl->ob->speed_left = pl->ob->speed;
990 } 1043 }
991} 1044}
992 1045
993#define SPEED_DEBUG 1046void
994 1047process_events ()
995
996void process_events (mapstruct *map)
997{ 1048{
998 object *op; 1049 object *op;
1050
999 object marker; 1051 static object *marker;
1000 tag_t tag;
1001 1052
1053 if (!marker)
1054 marker = object::create ();
1055
1002 process_players1 (map); 1056 process_players1 ();
1003 1057
1004 memset(&marker, 0, sizeof(object));
1005 /* Put marker object at beginning of active list */
1006 marker.active_next = active_objects; 1058 marker->active_next = active_objects;
1007 1059
1008 if (marker.active_next) 1060 if (marker->active_next)
1009 marker.active_next->active_prev = &marker;
1010 marker.active_prev = NULL;
1011 active_objects = &marker;
1012
1013 while (marker.active_next) {
1014 op = marker.active_next;
1015 tag = op->count;
1016
1017 /* Move marker forward - swap op and marker */
1018 op->active_prev = marker.active_prev;
1019
1020 if (op->active_prev)
1021 op->active_prev->active_next = op;
1022 else
1023 active_objects = op;
1024
1025 marker.active_next = op->active_next;
1026
1027 if (marker.active_next)
1028 marker.active_next->active_prev = &marker; 1061 marker->active_next->active_prev = marker;
1062
1063 marker->active_prev = NULL;
1064 active_objects = marker;
1065
1066 while (marker->active_next)
1067 {
1068 op = marker->active_next;
1069
1070 /* Move marker forward - swap op and marker */
1071 op->active_prev = marker->active_prev;
1072
1073 if (op->active_prev)
1074 op->active_prev->active_next = op;
1075 else
1076 active_objects = op;
1077
1078 marker->active_next = op->active_next;
1079
1080 if (marker->active_next)
1081 marker->active_next->active_prev = marker;
1082
1029 marker.active_prev = op; 1083 marker->active_prev = op;
1030 op->active_next = &marker; 1084 op->active_next = marker;
1031 1085
1032 /* Now process op */ 1086 /* Now process op */
1033 if (QUERY_FLAG (op, FLAG_FREED)) { 1087 if (QUERY_FLAG (op, FLAG_FREED))
1088 {
1034 LOG (llevError, "BUG: process_events(): Free object on list\n"); 1089 LOG (llevError, "BUG: process_events(): Free object on list\n");
1035 op->speed = 0; 1090 op->speed = 0;
1036 update_ob_speed (op); 1091 update_ob_speed (op);
1037 continue; 1092 continue;
1038 } 1093 }
1039 1094
1040 /* I've seen occasional crashes due to this - the object is removed, 1095 /* I've seen occasional crashes due to this - the object is removed,
1041 * and thus the map it points to (last map it was on) may be bogus 1096 * and thus the map it points to (last map it was on) may be bogus
1042 * The real bug is to try to find out the cause of this - someone 1097 * The real bug is to try to find out the cause of this - someone
1043 * is probably calling remove_ob without either an insert_ob or 1098 * is probably calling remove_ob without either an insert_ob or
1044 * free_object afterwards, leaving an object dangling. But I'd 1099 * free_object afterwards, leaving an object dangling. But I'd
1045 * rather log this and continue on instead of crashing. 1100 * rather log this and continue on instead of crashing.
1046 * Don't remove players - when a player quits, the object is in 1101 * Don't remove players - when a player quits, the object is in
1047 * sort of a limbo, of removed, but something we want to keep 1102 * sort of a limbo, of removed, but something we want to keep
1048 * around. 1103 * around.
1049 */ 1104 */
1050 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && 1105 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
1051 op->map && op->map->in_memory != MAP_IN_MEMORY) { 1106 {
1052 LOG (llevError, "BUG: process_events(): Removed object on list\n"); 1107 LOG (llevError, "BUG: process_events(): Removed object on list\n");
1053 dump_object(op); 1108 char *dump = dump_object (op);
1054 LOG(llevError, errmsg); 1109 LOG (llevError, dump);
1055 free_object(op); 1110 free (dump);
1111 op->destroy ();
1056 continue; 1112 continue;
1057 } 1113 }
1058 1114
1059 if ( ! op->speed) { 1115 if (!op->speed)
1116 {
1060 LOG (llevError, "BUG: process_events(): Object %s has no speed, " 1117 LOG (llevError, "BUG: process_events(): Object %s has no speed, "
1061 "but is on active list\n", op->arch->name); 1118 "but is on active list\n", &op->arch->name);
1062 update_ob_speed (op); 1119 update_ob_speed (op);
1063 continue; 1120 continue;
1064 } 1121 }
1065 1122
1066 if (op->map == NULL && op->env == NULL && op->name && 1123 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP)
1067 op->type != MAP && map == NULL) { 1124 {
1068 LOG (llevError, "BUG: process_events(): Object without map or " 1125 LOG (llevError, "BUG: process_events(): Object without map or "
1069 "inventory is on active list: %s (%d)\n", 1126 "inventory is on active list: %s (%d)\n", &op->name, op->count);
1070 op->name, op->count);
1071 op->speed = 0; 1127 op->speed = 0;
1072 update_ob_speed (op); 1128 update_ob_speed (op);
1073 continue; 1129 continue;
1074 } 1130 }
1075 1131
1076 if (map != NULL && op->map != map)
1077 continue;
1078
1079 /* Animate the object. Bug of feature that andim_speed 1132 /* Animate the object. Bug or feature that anim_speed
1080 * is based on ticks, and not the creatures speed? 1133 * is based on ticks, and not the creatures speed?
1081 */ 1134 */
1082 if (op->anim_speed && op->last_anim >= op->anim_speed) 1135 if (op->anim_speed && op->last_anim >= op->anim_speed)
1083 { 1136 {
1084 if ((op->type==PLAYER)||(op->type==MONSTER)) 1137 if ((op->type == PLAYER) || (op->type == MONSTER))
1085 animate_object(op, op->facing); 1138 animate_object (op, op->facing);
1086 else 1139 else
1087 animate_object (op, op->direction); 1140 animate_object (op, op->direction);
1088 1141
1089 op->last_anim = 1; 1142 op->last_anim = 1;
1090 } 1143 }
1091 else 1144 else
1092 op->last_anim++; 1145 op->last_anim++;
1093 1146
1094 if (op->speed_left > 0) { 1147 if (op->speed_left > 0)
1148 {
1095#if 0 1149#if 0
1096 /* I've seen occasional crashes in move_symptom() with it 1150 /* I've seen occasional crashes in move_symptom() with it
1097 * crashing because op is removed - add some debugging to 1151 * crashing because op is removed - add some debugging to
1098 * track if it is removed at this point. 1152 * track if it is removed at this point.
1099 * This unfortunately is a bit too verbose it seems - not sure 1153 * This unfortunately is a bit too verbose it seems - not sure
1100 * why - I think what happens is a map is freed or something and 1154 * why - I think what happens is a map is freed or something and
1101 * some objects get 'lost' - removed never to be reclaimed. 1155 * some objects get 'lost' - removed never to be reclaimed.
1102 * removed objects generally shouldn't exist. 1156 * removed objects generally shouldn't exist.
1103 */ 1157 */
1104 if (QUERY_FLAG(op, FLAG_REMOVED)) { 1158 if (QUERY_FLAG (op, FLAG_REMOVED))
1159 {
1105 LOG(llevDebug,"process_events: calling process_object with removed object %s\n", 1160 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
1106 op->name?op->name:"null"); 1161 }
1107 }
1108#endif 1162#endif
1109 --op->speed_left; 1163 --op->speed_left;
1110 process_object (op); 1164 process_object (op);
1111 if (was_destroyed (op, tag)) 1165
1112 continue; 1166 if (op->destroyed ())
1113 } 1167 continue;
1168 }
1169
1114 if (settings.casting_time == TRUE && op->casting_time > 0) 1170 if (settings.casting_time == TRUE && op->casting_time > 0)
1115 op->casting_time--; 1171 op->casting_time--;
1172
1116 if (op->speed_left <= 0) 1173 if (op->speed_left <= 0)
1117 op->speed_left += FABS (op->speed); 1174 op->speed_left += FABS (op->speed);
1118 } 1175 }
1119 1176
1120 /* Remove marker object from active list */ 1177 /* Remove marker object from active list */
1121 if (marker.active_prev != NULL) 1178 if (marker->active_prev != NULL)
1122 marker.active_prev->active_next = NULL; 1179 marker->active_prev->active_next = NULL;
1123 else 1180 else
1124 active_objects = NULL; 1181 active_objects = NULL;
1125 1182
1126 process_players2 (map); 1183 process_players2 ();
1127} 1184}
1128 1185
1186void
1129void clean_tmp_files(void) { 1187clean_tmp_files (void)
1188{
1130 mapstruct *m, *next; 1189 maptile *m, *next;
1131 1190
1132 LOG(llevInfo,"Cleaning up...\n"); 1191 LOG (llevInfo, "Cleaning up...\n");
1133 1192
1134 /* We save the maps - it may not be intuitive why, but if there are unique 1193 /* We save the maps - it may not be intuitive why, but if there are unique
1135 * items, we need to save the map so they get saved off. Perhaps we should 1194 * items, we need to save the map so they get saved off. Perhaps we should
1136 * just make a special function that only saves the unique items. 1195 * just make a special function that only saves the unique items.
1137 */ 1196 */
1138 for(m=first_map;m!=NULL;m=next) { 1197 for (m = first_map; m; m = next)
1198 {
1139 next=m->next; 1199 next = m->next;
1200
1140 if (m->in_memory == MAP_IN_MEMORY) { 1201 if (m->in_memory == MAP_IN_MEMORY)
1202 {
1141 /* If we want to reuse the temp maps, swap it out (note that will also 1203 /* If we want to reuse the temp maps, swap it out (note that will also
1142 * update the log file. Otherwise, save the map (mostly for unique item 1204 * update the log file.
1143 * stuff). Note that the clean_tmp_map is called after the end of 1205 */
1144 * the for loop but is in the #else bracket. IF we are recycling the maps,
1145 * we certainly don't want the temp maps removed.
1146 */
1147 1206
1148 /* XXX The above comment is dead wrong */
1149 if (settings.recycle_tmp_maps == TRUE)
1150 swap_map(m); 1207 swap_map (m);
1151 else {
1152 new_save_map(m, 0); /* note we save here into a overlay map */
1153 clean_tmp_map(m);
1154 }
1155 } 1208 }
1156 } 1209 }
1210
1157 write_todclock(); /* lets just write the clock here */ 1211 write_todclock (); /* lets just write the clock here */
1158} 1212}
1159 1213
1160/* clean up everything before exiting */ 1214/* clean up everything before exiting */
1215void
1161void cleanup(void) 1216cleanup (void)
1162{ 1217{
1163 LOG(llevDebug,"Cleanup called. freeing data.\n"); 1218 LOG (llevDebug, "Cleanup called.\n");
1219
1220 for (player *pl = first_player; pl != NULL; pl = pl->next)
1221 save_player (pl->ob, 0);
1222
1223 for (player *pl = first_player; pl != NULL; pl = pl->next)
1224 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
1225 leave_map (pl->ob);
1226
1164 clean_tmp_files(); 1227 clean_tmp_files ();
1165 write_book_archive(); 1228 write_book_archive ();
1166#ifdef MEMORY_DEBUG 1229
1167 free_all_maps(); 1230 INVOKE_GLOBAL (CLEANUP);
1168 free_style_maps(); 1231
1169 free_all_object_data();
1170 free_all_archs();
1171 free_all_treasures();
1172 free_all_images();
1173 free_all_newserver();
1174 free_all_recipes();
1175 free_all_readable();
1176 free_all_god();
1177 free_all_anim();
1178 /* See what the string data that is out there that hasn't been freed. */
1179/* LOG(llevDebug, ss_dump_table(0xff));*/
1180#endif
1181 exit(0); 1232 _exit (0);
1182} 1233}
1183 1234
1235void
1184void leave(player *pl, int draw_exit) { 1236leave (player *pl, int draw_exit)
1237{
1185 if (pl != NULL) { 1238 if (pl != NULL)
1239 {
1186 /* We do this so that the socket handling routine can do the final 1240 /* We do this so that the socket handling routine can do the final
1187 * cleanup. We also leave that loop to actually handle the freeing 1241 * cleanup. We also leave that loop to actually handle the freeing
1188 * of the data. 1242 * of the data.
1189 */ 1243 */
1190 if (pl->ob->type != DEAD_OBJECT) 1244 if (pl->ob->type != DEAD_OBJECT)
1191 { 1245 {
1192 execute_global_event (EVENT_LOGOUT, pl, pl->socket.host);
1193 LOG (llevInfo,"LOGOUT: Player named %s from ip %s\n", pl->ob->name, pl->socket.host);
1194
1195 pl->socket.status = Ns_Dead; 1246 pl->socket->status = Ns_Dead;
1196 1247
1197 /* If a hidden dm dropped connection do not create 1248 /* If a hidden dm dropped connection do not create
1198 * inconsistencies by showing that they have left the game 1249 * inconsistencies by showing that they have left the game
1199 */ 1250 */
1200 if (!(QUERY_FLAG(pl->ob,FLAG_WIZ) && pl->ob->contr->hidden) 1251 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
1201 && draw_exit
1202 && (pl->state != ST_GET_NAME && pl->state!=ST_GET_PASSWORD && pl->state != ST_CONFIRM_PASSWORD)) 1252 && draw_exit && (pl->state != ST_GET_NAME && pl->state != ST_GET_PASSWORD && pl->state != ST_CONFIRM_PASSWORD))
1253 {
1254 if (pl->ob->map)
1203 { 1255 {
1256 INVOKE_PLAYER (LOGOUT, pl);
1257 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->socket->host);
1258 }
1259
1204 char buf[MAX_BUF]; 1260 char buf[MAX_BUF];
1261
1205 sprintf (buf, "%s left the game.", pl->ob->name); 1262 sprintf (buf, "%s left the game.", &pl->ob->name);
1206 new_draw_info(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, buf); 1263 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, buf);
1207 } 1264 }
1208 1265
1209 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 1266 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
1210 leave_map (pl->ob); 1267 leave_map (pl->ob);
1211 1268
1212 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */ 1269 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
1213 } 1270 }
1214 } 1271 }
1215} 1272}
1216 1273
1274int
1217int forbid_play(void) 1275forbid_play (void)
1218{ 1276{
1219#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE) 1277#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
1220 char buf[MAX_BUF], day[MAX_BUF]; 1278 char buf[MAX_BUF], day[MAX_BUF];
1221 FILE *fp; 1279 FILE *fp;
1222 time_t clock; 1280 time_t clock;
1223 struct tm *tm; 1281 struct tm *tm;
1224 int i, start, stop, forbit=0, comp; 1282 int i, start, stop, forbit = 0, comp;
1225 1283
1226 clock = time (NULL); 1284 clock = time (NULL);
1227 tm = (struct tm *) localtime (&clock); 1285 tm = (struct tm *) localtime (&clock);
1228 1286
1229 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE); 1287 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
1230 if ((fp = open_and_uncompress(buf, 0, &comp)) == NULL) 1288 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
1231 return 0; 1289 return 0;
1232 1290
1233 while (fgets (buf, MAX_BUF, fp)) { 1291 while (fgets (buf, MAX_BUF, fp))
1234 if (buf[0]=='#') continue; 1292 {
1293 if (buf[0] == '#')
1294 continue;
1235 if (!strncmp (buf, "msg", 3)) { 1295 if (!strncmp (buf, "msg", 3))
1296 {
1236 if (forbit) 1297 if (forbit)
1237 while (fgets (buf, MAX_BUF, fp)) /* print message */ 1298 while (fgets (buf, MAX_BUF, fp)) /* print message */
1238 fputs (buf, logfile); 1299 fputs (buf, logfile);
1239 break; 1300 break;
1240 1301
1302 }
1241 } else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) { 1303 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
1304 {
1242 LOG(llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 1305 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
1243 continue; 1306 continue;
1244 } 1307 }
1245 1308
1246 for (i=0; i< 7; i++) { 1309 for (i = 0; i < 7; i++)
1247 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && 1310 {
1248 (tm->tm_hour >= start) && (tm->tm_hour < stop)) 1311 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
1249 forbit = 1; 1312 forbit = 1;
1250 } 1313 }
1251 } 1314 }
1252 1315
1253 close_and_delete(fp, comp); 1316 close_and_delete (fp, comp);
1254 1317
1255 return forbit; 1318 return forbit;
1256#else 1319#else
1257 return 0; 1320 return 0;
1258#endif 1321#endif
1259} 1322}
1260 1323
1261/* 1324/*
1262 * do_specials() is a collection of functions to call from time to time. 1325 * do_specials() is a collection of functions to call from time to time.
… …
1272 * doing the various things. 1335 * doing the various things.
1273 */ 1336 */
1274 1337
1275extern unsigned long todtick; 1338extern unsigned long todtick;
1276 1339
1340void
1277void do_specials(void) { 1341do_specials (void)
1278 1342{
1279#ifdef WATCHDOG
1280 if (!(pticks % 503))
1281 watchdog();
1282#endif
1283
1284 if (!(pticks % PTICKS_PER_CLOCK)) 1343 if (!(pticks % PTICKS_PER_CLOCK))
1285 tick_the_clock(); 1344 tick_the_clock ();
1286 1345
1346 if (!(pticks % 7))
1347 shstr::gc ();
1348
1287 if (!(pticks % 509)) 1349 if (!(pticks % 79))
1288 flush_old_maps(); /* Clears the tmp-files of maps which have reset */ 1350 flush_old_maps (); /* Clears the tmp-files of maps which have reset */
1289 1351
1290 if (!(pticks % 2503)) 1352 if (!(pticks % 2503))
1291 fix_weight(); /* Hack to fix weightproblems caused by bugs */ 1353 fix_weight (); /* Hack to fix weightproblems caused by bugs */
1292 1354
1293 if (!(pticks % 2521))
1294 metaserver_update(); /* 2500 ticks is about 5 minutes */
1295
1296 if (!(pticks % 5003)) 1355 if (!(pticks % 5003))
1297 write_book_archive(); 1356 write_book_archive ();
1298 1357
1299 if (!(pticks % 5009)) 1358 if (!(pticks % 5009))
1300 clean_friendly_list(); 1359 clean_friendly_list ();
1301 1360
1302 if (!(pticks % 5011)) 1361 if (!(pticks % 5011))
1303 obsolete_parties(); 1362 obsolete_parties ();
1304 1363
1305 if (!(pticks % 12503)) 1364 if (!(pticks % 12503))
1306 fix_luck(); 1365 fix_luck ();
1307} 1366}
1308 1367
1368void
1309void server_tick () 1369server_tick ()
1310{ 1370{
1311 nroferrors = 0; 1371 nroferrors = 0;
1312 1372
1373 // first do the user visible stuff
1313 doeric_server(); 1374 doeric_server ();
1375 INVOKE_GLOBAL (CLOCK);
1314 process_events(NULL); /* "do" something with objects with speed */ 1376 process_events (); /* "do" something with objects with speed */
1315 cftimer_process_timers();/* Process the crossfire Timers */
1316 /* Lauwenmark : Here we handle the CLOCK global event */
1317 execute_global_event(EVENT_CLOCK);
1318 flush_sockets(); 1377 flush_sockets ();
1378
1379 // then do some bookkeeping, should not really be here
1319 check_active_maps(); /* Removes unused maps after a certain timeout */ 1380 check_active_maps (); /* Removes unused maps after a certain timeout */
1320 do_specials(); /* Routines called from time to time. */ 1381 do_specials (); /* Routines called from time to time. */
1382 object::free_mortals ();
1321 1383
1322 ++pticks; 1384 ++pticks;
1323} 1385}
1324 1386
1387int
1325int main(int argc, char **argv) 1388main (int argc, char **argv)
1326{ 1389{
1327#ifdef WIN32 /* ---win32 this sets the win32 from 0d0a to 0a handling */
1328 _fmode = _O_BINARY ;
1329 bRunning = 1;
1330#endif
1331
1332#ifdef DEBUG_MALLOC_LEVEL
1333 malloc_debug(DEBUG_MALLOC_LEVEL);
1334#endif
1335
1336 settings.argc=argc; 1390 settings.argc = argc;
1337 settings.argv=argv; 1391 settings.argv = argv;
1392
1338 init(argc, argv); 1393 init (argc, argv);
1339 initPlugins(); /* GROS - Init the Plugins */
1340 1394
1395 initPlugins ();
1396
1397 for (;;)
1341 cfperl_main (); 1398 cfperl_main ();
1342 1399
1400 // unreached
1343 emergency_save( 0 ); 1401 emergency_save (0);
1344 cleanup( ); 1402 cleanup ();
1403
1345 return 0; 1404 return 0;
1346} 1405}

Diff Legend

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