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.1 by elmex, Sun Aug 13 17:16:04 2006 UTC vs.
Revision 1.22 by root, Sat Sep 9 21:48:29 2006 UTC

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

Diff Legend

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