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.3 by root, Thu Aug 17 20:23:31 2006 UTC vs.
Revision 1.23 by root, Sun Sep 10 15:59:57 2006 UTC

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

Diff Legend

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