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.61 by root, Wed Dec 27 18:09:49 2006 UTC

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

Diff Legend

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