ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/main.C
(Generate patch)

Comparing deliantra/server/server/main.C (file contents):
Revision 1.18 by root, Sun Sep 3 09:00:09 2006 UTC vs.
Revision 1.61 by root, Wed Dec 27 18:09:49 2006 UTC

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

Diff Legend

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