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.104 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.180 by root, Sat Nov 17 23:40:04 2018 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 10 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 20 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25#include <global.h> 26#include <global.h>
26#include <object.h> 27#include <object.h>
27#include <tod.h> 28#include <tod.h>
28 29
29#include <sproto.h> 30#include <sproto.h>
30#include <time.h> 31#include <time.h>
31 32
32#include <../random_maps/random_map.h> 33#include <glib.h>
33#include <../random_maps/rproto.h> 34
35#include <rmg.h>
36#include <rproto.h>
34#include "path.h" 37#include "path.h"
35
36static char days[7][4] = {
37 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
38};
39 38
40void 39void
41version (object *op) 40version (object *op)
42{ 41{
43 if (op)
44 clear_win_info (op);
45
46 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 42 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
47
48 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
49 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
50 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
51 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
52 new_draw_info (NDI_UNIQUE, 0, op, "");
53 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
54 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
55 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
56 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
57 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
58 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
59 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
60 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
61 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
62 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
65 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
66 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
67 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
68 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>");
69 new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>");
71 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>");
79 new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>");
80 new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>");
81 new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>");
82 new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>");
83 new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>");
84 new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>");
85 new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>");
86 new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>");
87 new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>");
88 new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>");
89 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
90 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
91 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
92 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
93 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
94 new_draw_info (NDI_UNIQUE, 0, op, "");
95 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
96 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
97 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
98 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
99 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
100 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
101 new_draw_info (NDI_UNIQUE, 0, op, "");
102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
103} 43}
104 44
105/* This is a basic little function to put the player back to his 45/* This is a basic little function to put the player back to his
106 * savebed. We do some error checking - its possible that the 46 * savebed.
107 * savebed map may no longer exist, so we make sure the player
108 * goes someplace.
109 */ 47 */
110void 48void
111enter_player_savebed (object *op) 49enter_player_savebed (object *op)
112{ 50{
113 object *tmp = object::create (); 51 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
114 EXIT_PATH (tmp) = op->contr->savebed_map;
115 EXIT_X (tmp) = op->contr->bed_x;
116 EXIT_Y (tmp) = op->contr->bed_y;
117 op->enter_exit (tmp);
118 tmp->destroy ();
119} 52}
120 53
121/* 54/*
122 * enter_map(): Moves the player and pets from current map (if any) to 55 * enter_map(): Moves the player and pets from current map (if any) to
123 * new map. map, x, y must be set. map is the map we are moving the 56 * new map. map, x, y must be set. map is the map we are moving the
124 * player to - it could be the map he just came from if the load failed for 57 * player to - it could be the map he just came from if the load failed for
125 * whatever reason. If default map coordinates are to be used, then 58 * whatever reason. If default map coordinates are to be used, then
126 * the function that calls this should figure them out. 59 * the function that calls this should figure them out.
127 */ 60 */
128void 61bool
129object::enter_map (maptile *newmap, int x, int y) 62object::enter_map (maptile *newmap, int x, int y)
130{ 63{
131 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 64 if (destroyed () || !newmap || !newmap->linkable ())
132 return; 65 return false;
133 66
134 if (out_of_map (newmap, x, y)) 67 if (out_of_map (newmap, x, y))
135 { 68 {
136 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 69 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
137 x = newmap->enter_x; 70 x = newmap->enter_x;
… …
139 if (out_of_map (newmap, x, y)) 72 if (out_of_map (newmap, x, y))
140 { 73 {
141 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n", 74 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n",
142 &newmap->path, x, y, newmap->width, newmap->height); 75 &newmap->path, x, y, newmap->width, newmap->height);
143 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 76 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
144 return; 77 return false;
145 } 78 }
146 } 79 }
147 80
148 if (contr && map != newmap && map) 81 if (contr && map != newmap && map)
149 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 82 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
150 return; 83 return false;
151 84
152 // remove, so stupid ob_locked does not trigger a failure 85 // remove, so stupid blocked does not trigger a failure
153 remove (); 86 remove ();
154 87
155 /* try to find a spot for the player */ 88 /* try to find a spot for the player */
156 if (ob_blocked (this, newmap, x, y)) 89 if (blocked (newmap, x, y))
157 { /* First choice blocked */ 90 { /* First choice blocked */
158 /* We try to find a spot for the player, starting closest in. 91 /* We try to find a spot for the player, starting closest in.
159 * We could use find_first_free_spot, but that doesn't randomize it at all, 92 * We could use find_first_free_spot, but that doesn't randomize it at all,
160 * So for example, if the north space is free, you would always end up there even 93 * So for example, if the north space is free, you would always end up there even
161 * if other spaces around are available. 94 * if other spaces around are available.
162 * Note that for the second and third calls, we could start at a position other 95 * Note that for the second and third calls, we could start at a position other
163 * than one, but then we could end up on the other side of walls and so forth. 96 * than one, but then we could end up on the other side of walls and so forth.
164 */ 97 */
165 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1); 98 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1);
166 99
167 if (i == -1) 100 if (i < 0)
168 { 101 {
169 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 102 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
170 if (i == -1) 103 if (i < 0)
171 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 104 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
172 } 105 }
173 106
174 if (i != -1) 107 if (i >= 0)
108 {
109 maptile *m = newmap;
110 sint16 nx = x + DIRX (i);
111 sint16 ny = y + DIRY (i);
112
113 if (xy_normalise (m, nx, ny))
175 { 114 {
176 x += freearr_x[i]; 115 newmap = m;
177 y += freearr_y[i]; 116 x = nx;
117 y = ny;
118 }
178 } 119 }
179 else 120 else
180 /* not much we can do in this case. */ 121 /* not much we can do in this case. */
181 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); 122 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);
182 } 123 }
183 124
184 if (contr && map != newmap) 125 if (contr && map != newmap)
185 { 126 {
186 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 127 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
187 return; 128 return false;
188 129
189 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 130 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
190 return; 131 return false;
191 } 132 }
192
193 this->x = x;
194 this->y = y;
195 map = newmap;
196
197 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
198 133
199 enemy = 0; 134 enemy = 0;
200 135
136 newmap->activate (); // workaround for activate activating everyhing on the map, includign the palyer on the {link} map
137 //newmap->insert (this, x, y);
138 newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
139 prefetch_surrounding_maps ();
140
141 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
142 {
201 if (contr) 143 if (contr)
202 { 144 {
203 contr->maplevel = newmap->path; 145 contr->maplevel = newmap->path;
204 contr->count = 0; 146 contr->count = 0;
205 }
206 147
207 /* Update any golems */ 148 /* Update any golems */
208 if (type == PLAYER)
209 if (object *golem = contr->golem) 149 if (object *golem = contr->golem)
210 { 150 {
211 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 151 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
212 152
213 if (i < 0) 153 if (i < 0)
214 golem->destroy (); 154 golem->drop_and_destroy ();
215 else 155 else
216 { 156 {
217 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 157 newmap->insert (golem, x + DIRX (i), y + DIRY (i));
218 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 158 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
159 }
219 } 160 }
220 } 161 }
221 162
222 /* since the players map is already loaded, we don't need to worry 163 /* since the players map is already loaded, we don't need to worry
223 * about pending objects. 164 * about pending objects.
224 */ 165 */
225 remove_all_pets (newmap); 166 move_all_pets ();
167
168 return true;
169 }
170
171 return false;
226} 172}
227 173
228/* process_players1 and process_players2 do all the player related stuff. 174/* process_players1 and process_players2 do all the player related stuff.
229 * I moved it out of process events and process_map. This was to some 175 * I moved it out of process events and process_map. This was to some
230 * extent for debugging as well as to get a better idea of the time used 176 * extent for debugging as well as to get a better idea of the time used
… …
241 flag = 0; 187 flag = 0;
242 for_all_players (pl) 188 for_all_players (pl)
243 { 189 {
244 pl->refcnt_chk (); 190 pl->refcnt_chk ();
245 191
246 if (!pl->ob || !pl->ns || !pl->ob->active) 192 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
247 continue; 193 continue;
248 194
249 if (pl->ob->speed_left > 0.f && pl->ns)
250 if (handle_newcs_player (pl->ob)) 195 if (handle_newcs_player (pl->ob))
251 flag = 1; 196 flag = 1;
252 197 }
253 /* If the player is not actively playing, don't make a 198 }
254 * backup save - nothing to save anyway. Plus, the
255 * map may not longer be valid. This can happen when the
256 * player quits - they exist for purposes of tracking on the map,
257 * but don't actually reside on any actual map.
258 */
259 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
260 continue;
261 } /* end of for loop for all the players */
262 } /* for flag */
263 199
264 for_all_players (pl) 200 for_all_players (pl)
265 { 201 {
266 object *ob = pl->ob; 202 object *ob = pl->ob;
267 203
204 // process_objects destroys the speed_left value
205 pl->speed_left_save = ob->speed_left;
206
268 if (!ob || !pl->ns || !ob->active) 207 if (expect_false (!ob || !pl->ns || !ob->active))
269 continue; 208 continue;
270
271 // process_events might steal us one speed slot, so adjust accordingly
272 if (ob->speed_left > 0.f)
273 ++ob->speed_left;
274 209
275 do_some_living (ob); 210 do_some_living (ob);
276 } 211 }
277} 212}
278 213
… …
280process_players2 () 215process_players2 ()
281{ 216{
282 /* Then check if any players should use weapon-speed instead of speed */ 217 /* Then check if any players should use weapon-speed instead of speed */
283 for_all_players (pl) 218 for_all_players (pl)
284 { 219 {
285 if (pl->has_hit) 220 // restore speed_left value saved by process_players1
286 { 221 pl->ob->speed_left = pl->speed_left_save;
287 pl->ob->speed_left = min (pl->weapon_speed (), pl->ob->speed_left + pl->weapon_speed ());
288 222
289 if (pl->ob->speed_left > 0.f) 223 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
290 pl->has_hit = 0;
291 }
292 else
293 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); 224 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
294 } 225 }
295} 226}
296 227
297void 228static void
298process_events () 229process_events ()
299{ 230{
300 process_players1 (); 231 process_players1 ();
301 232
302 for_all_actives (op) 233 for_all_actives (op)
303 { 234 {
235 // try to prefetch some stuff we expect to need
236 // obviously, it should be grouped into the same cacheline.
237 // preliminary results indicate that this gives halves the speed
238 // used for the inner loop
239 if (_i < actives.size ()) // HACK, rely on _i :/
240 {
241 object *next = actives [_i + 1];
242
243 ecb_prefetch (&next->flag , 0, 1);
244 ecb_prefetch (&next->speed , 0, 1);
245 ecb_prefetch (&next->anim_speed, 0, 1);
246 ecb_prefetch (&next->contr , 0, 1);
247 }
248
304 /* Now process op */ 249 /* Now process op */
305 if (QUERY_FLAG (op, FLAG_FREED)) 250 if (expect_false (op->flag [FLAG_FREED]))
306 { 251 {
307 LOG (llevError, "BUG: process_events(): Free object on list\n"); 252 LOG (llevError, "BUG: process_events(): Free object on list (%s)\n", op->debug_desc ());
308 op->set_speed (0); 253 op->set_speed (0);
309 continue; 254 continue;
310 } 255 }
311 256
312 if (!op->has_active_speed ()) 257 if (expect_false (!op->has_active_speed ()))
313 { 258 {
314 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 259 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
315 "but is on active list\n", op->debug_desc (), op->speed); 260 "but is on active list\n", op->debug_desc (), op->speed);
316 op->set_speed (0); 261 op->set_speed (0);
317 continue; 262 continue;
318 } 263 }
319 264
320 if (op->flag [FLAG_REMOVED]) 265 if (expect_false (op->flag [FLAG_REMOVED]))
321 { 266 {
322 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n", 267 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
323 op->debug_desc ()); 268 op->debug_desc ());
324 op->set_speed (0); 269 op->set_speed (0);
325 continue; 270 continue;
… …
334 op->last_anim = 1; 279 op->last_anim = 1;
335 } 280 }
336 else 281 else
337 ++op->last_anim; 282 ++op->last_anim;
338 283
339 if (op->speed_left > 0.f) 284 if (expect_false (op->speed_left > 0.f))
340 { 285 {
341 --op->speed_left; 286 --op->speed_left;
342 process_object (op); 287 process_object (op);
343
344 if (op->destroyed ())
345 continue;
346 } 288 }
347 289
348 if (!op->contr) 290 // this will destroy the speed_left value for players, but
291 // process_players1 and ..2 save/restore the real value,
292 // so we can avoid a costly test here.
349 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 293 op->speed_left = min (op->speed, op->speed_left + op->speed);
350 } 294 }
351 295
352 process_players2 (); 296 process_players2 ();
353} 297}
354 298
355/* clean up everything before exiting */ 299/* clean up everything before exiting */
356void 300void
357emergency_save () 301emergency_save ()
358{ 302{
359 LOG (llevDebug, "emergency save begin.\n"); 303 LOG (llevInfo, "emergency_save: enter\n");
304
305 LOG (llevInfo, "emergency_save: saving book archive\n");
306 write_book_archive ();
360 307
361 cfperl_emergency_save (); 308 cfperl_emergency_save ();
362 309
363 LOG (llevDebug, "saving book archive.\n");
364 write_book_archive ();
365
366 LOG (llevDebug, "emergency save done.\n"); 310 LOG (llevInfo, "emergency_save: leave\n");
367} 311}
368 312
369// send all clients some informational text 313// send all clients some informational text
370static void 314static void
371cleanup_inform (const char *cause, bool make_core) 315cleanup_inform (const char *cause, bool make_core)
372{ 316{
373 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN); 317 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
374 318
375 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n"); 319 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
376 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause); 320 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
377 321
378 if (make_core) 322 if (make_core)
379 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n"); 323 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
380 else 324 else
381 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.\n"); 325 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
382 326
383 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 327 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
384 328
385 flush_sockets (); 329 client::flush_sockets ();
386} 330}
387 331
388/* clean up everything before exiting */ 332/* clean up everything before exiting */
389void 333void
390cleanup (const char *cause, bool make_core) 334cleanup (const char *cause, bool make_core)
391{ 335{
392 if (make_core) 336 if (make_core)
393 fork_abort (cause); 337 fork_abort (cause);
394 338
395 LOG (llevError, "cleanup cause: %s\n", cause); 339 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
396 340
397 if (!make_core) 341 if (!make_core)
398 cleanup_inform (cause, make_core); 342 cleanup_inform (cause, make_core);
399 343
400 LOG (llevDebug, "cleanup begin.\n"); 344 LOG (llevDebug, "cleanup begin.\n");
… …
410 LOG (llevDebug, "running cleanup handlers.\n"); 354 LOG (llevDebug, "running cleanup handlers.\n");
411 INVOKE_GLOBAL (CLEANUP); 355 INVOKE_GLOBAL (CLEANUP);
412 356
413 LOG (llevDebug, "cleanup done.\n"); 357 LOG (llevDebug, "cleanup done.\n");
414 358
359 log_cleanup ();
360
415 if (make_core) 361 if (make_core)
416 {
417 cleanup_inform (cause, make_core); 362 cleanup_inform (cause, make_core);
418 cfperl_cleanup (make_core);
419 _exit (1);
420 }
421 else 363 else
422 { 364 {
423 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n"); 365 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
424 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n"); 366 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
425 flush_sockets (); 367 client::flush_sockets ();
368 }
369
426 cfperl_cleanup (make_core); 370 cfperl_cleanup (make_core);
427 _exit (0); 371 _exit (make_core);
428 }
429}
430
431int
432forbid_play (void)
433{
434#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
435 char buf[MAX_BUF], day[MAX_BUF];
436 FILE *fp;
437 time_t clock;
438 struct tm *tm;
439 int i, start, stop, forbit = 0, comp;
440
441 clock = time (NULL);
442 tm = (struct tm *) localtime (&clock);
443
444 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
445 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
446 return 0;
447
448 while (fgets (buf, MAX_BUF, fp))
449 {
450 if (buf[0] == '#')
451 continue;
452
453 if (!strncmp (buf, "msg", 3))
454 {
455 if (forbit)
456 while (fgets (buf, MAX_BUF, fp)) /* print message */
457 fputs (buf, logfile);
458 break;
459 }
460 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
461 {
462 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
463 continue;
464 }
465
466 for (i = 0; i < 7; i++)
467 {
468 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
469 forbit = 1;
470 }
471 }
472
473 close_and_delete (fp, comp);
474
475 return forbit;
476#else
477 return 0;
478#endif
479} 372}
480 373
481/* 374/*
482 * do_specials() is a collection of functions to call from time to time. 375 * do_specials() is a collection of functions to call from time to time.
483 * Modified 2000-1-14 MSW to use the global pticks count to determine how 376 * Modified 2000-1-14 MSW to use the global server_tick count to determine how
484 * often to do things. This will allow us to spred them out more often. 377 * often to do things. This will allow us to spred them out more often.
485 * I use prime numbers for the factor count - in that way, it is less likely 378 * I use prime numbers for the factor count - in that way, it is less likely
486 * these actions will fall on the same tick (compared to say using 500/2500/15000 379 * these actions will fall on the same tick (compared to say using 500/2500/15000
487 * which would mean on that 15,000 tick count a whole bunch of stuff gets 380 * which would mean on that 15,000 tick count a whole bunch of stuff gets
488 * done). Of course, there can still be times where multiple specials are 381 * done). Of course, there can still be times where multiple specials are
489 * done on the same tick, but that will happen very infrequently 382 * done on the same tick, but that will happen very infrequently
490 * 383 *
491 * I also think this code makes it easier to see how often we really are 384 * I also think this code makes it easier to see how often we really are
492 * doing the various things. 385 * doing the various things.
493 */ 386 */
387static void
388do_specials ()
389{
390 shstr::gc ();
391 archetype::gc ();
392
393 if (expect_false (!(server_tick % TICKS_PER_HOUR)))
394 maptile::adjust_daylight ();
395
396 if (expect_false (!(server_tick % 2503)))
397 fix_weight (); /* Hack to fix weightproblems caused by bugs */
398
399 if (expect_false (!(server_tick % 5003)))
400 write_book_archive ();
401
402 if (expect_false (!(server_tick % 5009)))
403 clean_friendly_list ();
404
405 if (expect_false (!(server_tick % 5011)))
406 obsolete_parties ();
407
408 if (expect_false (!(server_tick % 12503)))
409 fix_luck ();
410}
411
494void 412void
495do_specials (void) 413one_tick ()
496{
497 if (!(pticks % TICKS_PER_HOUR))
498 adjust_daylight ();
499
500 if (!(pticks % 7))
501 shstr::gc ();
502
503 if (!(pticks % 2503))
504 fix_weight (); /* Hack to fix weightproblems caused by bugs */
505
506 if (!(pticks % 5003))
507 write_book_archive ();
508
509 if (!(pticks % 5009))
510 clean_friendly_list ();
511
512 if (!(pticks % 5011))
513 obsolete_parties ();
514
515 if (!(pticks % 12503))
516 fix_luck ();
517}
518
519void
520server_tick ()
521{ 414{
522 // first do the user visible stuff 415 // first do the user visible stuff
523 doeric_server ();
524 INVOKE_GLOBAL (CLOCK); 416 INVOKE_GLOBAL (CLOCK);
525 process_events (); /* "do" something with objects with speed */ 417 process_events (); // "do" something with objects with speed
526 flush_sockets (); 418 client::clock (); // draw client maps etc.
527 419
528 // then do some bookkeeping, should not really be here 420 // then do some bookkeeping, should not really be here
529 do_specials (); /* Routines called from time to time. */ 421 do_specials (); /* Routines called from time to time. */
530 attachable::check_mortals (); 422 attachable::check_mortals ();
531 423
532 ++pticks; 424 // now that we aggressively reuse id's, this is very unlikely to happen...
425 if (object::object_count >= RESTART_COUNT)
426 cleanup ("running out of protocol ID values - need full restart");
533} 427}
534
535#if 0
536// used fro benchmarking (x86/amd64-specific)
537typedef unsigned long tval;
538typedef unsigned long long stamp64;
539
540extern inline tval
541stamp (void)
542{
543 tval tsc;
544 asm volatile ("rdtsc":"=a" (tsc)::"edx");
545
546 return tsc;
547}
548
549extern inline tval
550measure (tval t)
551{
552 tval tsc;
553 asm volatile ("rdtsc":"=a" (tsc)::"edx");
554
555 if (tsc > t)
556 return tsc - t;
557 else
558 return t - tsc;
559}
560
561int
562main (int argc, char **argv)
563{
564 rand_gen rg(0);
565 tval fastest = 0x7fffffff;
566 for (int loop = 10000; loop--; )
567 {
568 tval s = stamp ();
569 volatile int i = rg.get_int(25);
570 fastest = min (fastest, measure (s));
571 }
572
573 //printf ("fastest %d\n", fastest);
574 for (int i = 0; i < 1024*1024*3; ++i)
575 {
576 char c = rg.get_int (256);
577 write (2, &c, 1);
578 }
579}
580
581#else
582 428
583// normal main 429// normal main
584int 430int
585main (int argc, char **argv) 431main (int argc, char **argv)
586{ 432{
587 settings.argc = argc; 433 settings.argc = argc;
588 settings.argv = argv; 434 settings.argv = argv;
589 435
436 rndm.seed (time (0));
437
438 // temporary(?) testing hack
439 if (argc >= 2 && !strcmp (argv [1], "--noise"))
440 {
441 void noise_test ();
442 noise_test ();
443 exit (0);
444 }
445
446#if 0
447 // code sometiems used for timing benchmarks
448 random_number_generator<freeciv_random_generator> rng;
449 rng.seed(0);
450 for (int i = 0; i < 10; ++i)
451 printf ("%08x\n", rng.get_u32());
452 for (int i = 0; i < 1000000; ++i)
453 volatile int r = rng.get_u32 ();
454 cstamp s = stamp ();
455 for (int i = 0; i < 1000000; ++i)
456 volatile int r = rng.next ();
457 printf ("c %d\n", (int)measure (s));
458 exit (0);
459#endif
460
590 init (argc, argv); 461 init (argc, argv);
591
592 initPlugins ();
593 462
594 for (;;) 463 for (;;)
595 cfperl_main (); 464 cfperl_main ();
596} 465}
597#endif
598 466

Diff Legend

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