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.139 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.179 by root, Sat Nov 17 23:33:18 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <object.h> 26#include <object.h>
… …
29#include <sproto.h> 29#include <sproto.h>
30#include <time.h> 30#include <time.h>
31 31
32#include <glib.h> 32#include <glib.h>
33 33
34#include <../random_maps/random_map.h> 34#include <rmg.h>
35#include <../random_maps/rproto.h> 35#include <rproto.h>
36#include "path.h" 36#include "path.h"
37
38static char days[7][4] = {
39 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
40};
41 37
42void 38void
43version (object *op) 39version (object *op)
44{ 40{
45 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION); 41 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
46
47#if 0
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#endif
104} 42}
105 43
106/* This is a basic little function to put the player back to his 44/* This is a basic little function to put the player back to his
107 * savebed. We do some error checking - its possible that the 45 * savebed.
108 * savebed map may no longer exist, so we make sure the player
109 * goes someplace.
110 */ 46 */
111void 47void
112enter_player_savebed (object *op) 48enter_player_savebed (object *op)
113{ 49{
114 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y); 50 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
… …
119 * new map. map, x, y must be set. map is the map we are moving the 55 * new map. map, x, y must be set. map is the map we are moving the
120 * player to - it could be the map he just came from if the load failed for 56 * player to - it could be the map he just came from if the load failed for
121 * whatever reason. If default map coordinates are to be used, then 57 * whatever reason. If default map coordinates are to be used, then
122 * the function that calls this should figure them out. 58 * the function that calls this should figure them out.
123 */ 59 */
124void 60bool
125object::enter_map (maptile *newmap, int x, int y) 61object::enter_map (maptile *newmap, int x, int y)
126{ 62{
127 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE) 63 if (destroyed () || !newmap || !newmap->linkable ())
128 return; 64 return false;
129 65
130 if (out_of_map (newmap, x, y)) 66 if (out_of_map (newmap, x, y))
131 { 67 {
132 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 68 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
133 x = newmap->enter_x; 69 x = newmap->enter_x;
… …
135 if (out_of_map (newmap, x, y)) 71 if (out_of_map (newmap, x, y))
136 { 72 {
137 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n", 73 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n",
138 &newmap->path, x, y, newmap->width, newmap->height); 74 &newmap->path, x, y, newmap->width, newmap->height);
139 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 75 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
140 return; 76 return false;
141 } 77 }
142 } 78 }
143 79
144 if (contr && map != newmap && map) 80 if (contr && map != newmap && map)
145 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 81 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
146 return; 82 return false;
147 83
148 // remove, so stupid ob_locked does not trigger a failure 84 // remove, so stupid blocked does not trigger a failure
149 remove (); 85 remove ();
150 86
151 /* try to find a spot for the player */ 87 /* try to find a spot for the player */
152 if (blocked (newmap, x, y)) 88 if (blocked (newmap, x, y))
153 { /* First choice blocked */ 89 { /* First choice blocked */
… …
158 * Note that for the second and third calls, we could start at a position other 94 * Note that for the second and third calls, we could start at a position other
159 * than one, but then we could end up on the other side of walls and so forth. 95 * than one, but then we could end up on the other side of walls and so forth.
160 */ 96 */
161 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1); 97 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1);
162 98
163 if (i == -1) 99 if (i < 0)
164 { 100 {
165 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 101 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
166 if (i == -1) 102 if (i < 0)
167 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
168 } 104 }
169 105
170 if (i != -1) 106 if (i >= 0)
107 {
108 maptile *m = newmap;
109 sint16 nx = x + DIRX (i);
110 sint16 ny = y + DIRY (i);
111
112 if (xy_normalise (m, nx, ny))
171 { 113 {
172 x += freearr_x[i]; 114 newmap = m;
173 y += freearr_y[i]; 115 x = nx;
116 y = ny;
117 }
174 } 118 }
175 else 119 else
176 /* not much we can do in this case. */ 120 /* not much we can do in this case. */
177 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); 121 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);
178 } 122 }
179 123
180 if (contr && map != newmap) 124 if (contr && map != newmap)
181 { 125 {
182 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 126 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
183 return; 127 return false;
184 128
185 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 129 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
186 return; 130 return false;
187 } 131 }
188
189 this->x = x;
190 this->y = y;
191 map = newmap;
192
193 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
194 132
195 enemy = 0; 133 enemy = 0;
196 134
135 newmap->activate (); // workaround for activate activating everyhing on the map, includign the palyer on the {link} map
136 //newmap->insert (this, x, y);
137 newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
138 prefetch_surrounding_maps ();
139
140 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
141 {
197 if (contr) 142 if (contr)
198 { 143 {
199 contr->maplevel = newmap->path; 144 contr->maplevel = newmap->path;
200 contr->count = 0; 145 contr->count = 0;
201 }
202 146
203 /* Update any golems */ 147 /* Update any golems */
204 if (type == PLAYER)
205 if (object *golem = contr->golem) 148 if (object *golem = contr->golem)
206 { 149 {
207 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 150 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
208 151
209 if (i < 0) 152 if (i < 0)
210 golem->drop_and_destroy (); 153 golem->drop_and_destroy ();
211 else 154 else
212 { 155 {
213 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 156 newmap->insert (golem, x + DIRX (i), y + DIRY (i));
214 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 157 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
158 }
215 } 159 }
216 } 160 }
217 161
218 /* since the players map is already loaded, we don't need to worry 162 /* since the players map is already loaded, we don't need to worry
219 * about pending objects. 163 * about pending objects.
220 */ 164 */
221 remove_all_pets (newmap); 165 move_all_pets ();
166
167 return true;
168 }
169
170 return false;
222} 171}
223 172
224/* process_players1 and process_players2 do all the player related stuff. 173/* process_players1 and process_players2 do all the player related stuff.
225 * I moved it out of process events and process_map. This was to some 174 * I moved it out of process events and process_map. This was to some
226 * extent for debugging as well as to get a better idea of the time used 175 * extent for debugging as well as to get a better idea of the time used
… …
249 198
250 for_all_players (pl) 199 for_all_players (pl)
251 { 200 {
252 object *ob = pl->ob; 201 object *ob = pl->ob;
253 202
203 // process_objects destroys the speed_left value
204 pl->speed_left_save = ob->speed_left;
205
254 if (expect_false (!ob || !pl->ns || !ob->active)) 206 if (expect_false (!ob || !pl->ns || !ob->active))
255 continue; 207 continue;
256 208
257 do_some_living (ob); 209 do_some_living (ob);
258 } 210 }
… …
262process_players2 () 214process_players2 ()
263{ 215{
264 /* Then check if any players should use weapon-speed instead of speed */ 216 /* Then check if any players should use weapon-speed instead of speed */
265 for_all_players (pl) 217 for_all_players (pl)
266 { 218 {
219 // restore speed_left value saved by process_players1
220 pl->ob->speed_left = pl->speed_left_save;
221
267 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp); 222 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
268 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); 223 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
269 } 224 }
270} 225}
271 226
272void 227static void
273process_events () 228process_events ()
274{ 229{
275 process_players1 (); 230 process_players1 ();
276 231
277 for_all_actives (op) 232 for_all_actives (op)
278 { 233 {
234 // try to prefetch some stuff we expect to need
235 // obviously, it should be grouped into the same cacheline.
236 // preliminary results indicate that this gives halves the speed
237 // used for the inner loop
238 if (_i < actives.size ()) // HACK, rely on _i :/
239 {
240 object *next = actives [_i + 1];
241
242 ecb_prefetch (&next->flag , 0, 1);
243 ecb_prefetch (&next->speed , 0, 1);
244 ecb_prefetch (&next->anim_speed, 0, 1);
245 ecb_prefetch (&next->contr , 0, 1);
246 }
247
279 /* Now process op */ 248 /* Now process op */
280 if (expect_false (QUERY_FLAG (op, FLAG_FREED))) 249 if (expect_false (op->flag [FLAG_FREED]))
281 { 250 {
282 LOG (llevError, "BUG: process_events(): Free object on list\n"); 251 LOG (llevError, "BUG: process_events(): Free object on list (%s)\n", op->debug_desc ());
283 op->set_speed (0); 252 op->set_speed (0);
284 continue; 253 continue;
285 } 254 }
286 255
287 if (expect_false (!op->has_active_speed ())) 256 if (expect_false (!op->has_active_speed ()))
… …
315 { 284 {
316 --op->speed_left; 285 --op->speed_left;
317 process_object (op); 286 process_object (op);
318 } 287 }
319 288
320 if (expect_true (!op->contr)) 289 // this will destroy the speed_left value for players, but
290 // process_players1 and ..2 save/restore the real value,
291 // so we can avoid a costly test here.
321 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 292 op->speed_left = min (op->speed, op->speed_left + op->speed);
322 } 293 }
323 294
324 process_players2 (); 295 process_players2 ();
325} 296}
326 297
327/* clean up everything before exiting */ 298/* clean up everything before exiting */
328void 299void
329emergency_save () 300emergency_save ()
330{ 301{
331 LOG (llevDebug, "emergency save begin.\n"); 302 LOG (llevInfo, "emergency_save: enter\n");
303
304 LOG (llevInfo, "emergency_save: saving book archive\n");
305 write_book_archive ();
332 306
333 cfperl_emergency_save (); 307 cfperl_emergency_save ();
334 308
335 LOG (llevDebug, "saving book archive.\n");
336 write_book_archive ();
337
338 LOG (llevDebug, "emergency save done.\n"); 309 LOG (llevInfo, "emergency_save: leave\n");
339} 310}
340 311
341// send all clients some informational text 312// send all clients some informational text
342static void 313static void
343cleanup_inform (const char *cause, bool make_core) 314cleanup_inform (const char *cause, bool make_core)
… …
362cleanup (const char *cause, bool make_core) 333cleanup (const char *cause, bool make_core)
363{ 334{
364 if (make_core) 335 if (make_core)
365 fork_abort (cause); 336 fork_abort (cause);
366 337
367 LOG (llevError, "cleanup cause: %s\n", cause); 338 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
368 339
369 if (!make_core) 340 if (!make_core)
370 cleanup_inform (cause, make_core); 341 cleanup_inform (cause, make_core);
371 342
372 LOG (llevDebug, "cleanup begin.\n"); 343 LOG (llevDebug, "cleanup begin.\n");
… …
399 _exit (make_core); 370 _exit (make_core);
400} 371}
401 372
402/* 373/*
403 * do_specials() is a collection of functions to call from time to time. 374 * do_specials() is a collection of functions to call from time to time.
404 * Modified 2000-1-14 MSW to use the global pticks count to determine how 375 * Modified 2000-1-14 MSW to use the global server_tick count to determine how
405 * often to do things. This will allow us to spred them out more often. 376 * often to do things. This will allow us to spred them out more often.
406 * I use prime numbers for the factor count - in that way, it is less likely 377 * I use prime numbers for the factor count - in that way, it is less likely
407 * these actions will fall on the same tick (compared to say using 500/2500/15000 378 * these actions will fall on the same tick (compared to say using 500/2500/15000
408 * which would mean on that 15,000 tick count a whole bunch of stuff gets 379 * which would mean on that 15,000 tick count a whole bunch of stuff gets
409 * done). Of course, there can still be times where multiple specials are 380 * done). Of course, there can still be times where multiple specials are
410 * done on the same tick, but that will happen very infrequently 381 * done on the same tick, but that will happen very infrequently
411 * 382 *
412 * I also think this code makes it easier to see how often we really are 383 * I also think this code makes it easier to see how often we really are
413 * doing the various things. 384 * doing the various things.
414 */ 385 */
415void 386static void
416do_specials (void) 387do_specials ()
417{ 388{
418 shstr::gc (); 389 shstr::gc ();
419 archetype::gc (); 390 archetype::gc ();
420 391
421 if (expect_false (!(pticks % TICKS_PER_HOUR))) 392 if (expect_false (!(server_tick % TICKS_PER_HOUR)))
422 maptile::adjust_daylight (); 393 maptile::adjust_daylight ();
423 394
424 if (expect_false (!(pticks % 2503))) 395 if (expect_false (!(server_tick % 2503)))
425 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 396 fix_weight (); /* Hack to fix weightproblems caused by bugs */
426 397
427 if (expect_false (!(pticks % 5003))) 398 if (expect_false (!(server_tick % 5003)))
428 write_book_archive (); 399 write_book_archive ();
429 400
430 if (expect_false (!(pticks % 5009))) 401 if (expect_false (!(server_tick % 5009)))
431 clean_friendly_list (); 402 clean_friendly_list ();
432 403
433 if (expect_false (!(pticks % 5011))) 404 if (expect_false (!(server_tick % 5011)))
434 obsolete_parties (); 405 obsolete_parties ();
435 406
436 if (expect_false (!(pticks % 12503))) 407 if (expect_false (!(server_tick % 12503)))
437 fix_luck (); 408 fix_luck ();
438} 409}
439 410
440void 411void
441server_tick () 412one_tick ()
442{ 413{
443 // first do the user visible stuff 414 // first do the user visible stuff
444 INVOKE_GLOBAL (CLOCK); 415 INVOKE_GLOBAL (CLOCK);
445 process_events (); // "do" something with objects with speed 416 process_events (); // "do" something with objects with speed
446 client::clock (); // draw client maps etc. 417 client::clock (); // draw client maps etc.
447 418
448 // then do some bookkeeping, should not really be here 419 // then do some bookkeeping, should not really be here
449 do_specials (); /* Routines called from time to time. */ 420 do_specials (); /* Routines called from time to time. */
450 attachable::check_mortals (); 421 attachable::check_mortals ();
451 422
452 ++pticks; 423 // now that we aggressively reuse id's, this is very unlikely to happen...
424 if (object::object_count >= RESTART_COUNT)
425 cleanup ("running out of protocol ID values - need full restart");
453} 426}
454 427
455// normal main 428// normal main
456int 429int
457main (int argc, char **argv) 430main (int argc, char **argv)
458{ 431{
459 settings.argc = argc; 432 settings.argc = argc;
460 settings.argv = argv; 433 settings.argv = argv;
434
435 rndm.seed (time (0));
436
437 // temporary(?) testing hack
438 if (argc >= 2 && !strcmp (argv [1], "--noise"))
439 {
440 void noise_test ();
441 noise_test ();
442 exit (0);
443 }
444
445#if 0
446 // code sometiems used for timing benchmarks
447 random_number_generator<freeciv_random_generator> rng;
448 rng.seed(0);
449 for (int i = 0; i < 10; ++i)
450 printf ("%08x\n", rng.get_u32());
451 for (int i = 0; i < 1000000; ++i)
452 volatile int r = rng.get_u32 ();
453 cstamp s = stamp ();
454 for (int i = 0; i < 1000000; ++i)
455 volatile int r = rng.next ();
456 printf ("c %d\n", (int)measure (s));
457 exit (0);
458#endif
461 459
462 rndm.seed (time (0));
463 g_thread_init (0); // for the slice allocator only
464
465 init (argc, argv); 460 init (argc, argv);
466 461
467 for (;;) 462 for (;;)
468 cfperl_main (); 463 cfperl_main ();
469} 464}

Diff Legend

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