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

Diff Legend

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