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.100 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.136 by root, Tue Dec 30 07:29:08 2008 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <object.h> 25#include <object.h>
27#include <tod.h> 26#include <tod.h>
28 27
29#include <sproto.h> 28#include <sproto.h>
30#include <time.h> 29#include <time.h>
31 30
31#include <glib.h>
32
32#include <../random_maps/random_map.h> 33#include <../random_maps/random_map.h>
33#include <../random_maps/rproto.h> 34#include <../random_maps/rproto.h>
34#include "path.h" 35#include "path.h"
35 36
36static char days[7][4] = { 37static char days[7][4] = {
… …
38}; 39};
39 40
40void 41void
41version (object *op) 42version (object *op)
42{ 43{
43 if (op)
44 clear_win_info (op);
45
46 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 44 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
47 45
46#if 0
48 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 47 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>"); 48 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>"); 49 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>"); 50 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
52 new_draw_info (NDI_UNIQUE, 0, op, ""); 51 new_draw_info (NDI_UNIQUE, 0, op, "");
… …
98 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>"); 97 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>"); 98 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>"); 99 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
101 new_draw_info (NDI_UNIQUE, 0, op, ""); 100 new_draw_info (NDI_UNIQUE, 0, op, "");
102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 101 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
102#endif
103} 103}
104 104
105/* This is a basic little function to put the player back to his 105/* This is a basic little function to put the player back to his
106 * savebed. We do some error checking - its possible that the 106 * savebed. We do some error checking - its possible that the
107 * savebed map may no longer exist, so we make sure the player 107 * savebed map may no longer exist, so we make sure the player
108 * goes someplace. 108 * goes someplace.
109 */ 109 */
110void 110void
111enter_player_savebed (object *op) 111enter_player_savebed (object *op)
112{ 112{
113 object *tmp = object::create (); 113 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} 114}
120 115
121/* 116/*
122 * enter_map(): Moves the player and pets from current map (if any) to 117 * 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 118 * new map. map, x, y must be set. map is the map we are moving the
… …
126 * the function that calls this should figure them out. 121 * the function that calls this should figure them out.
127 */ 122 */
128void 123void
129object::enter_map (maptile *newmap, int x, int y) 124object::enter_map (maptile *newmap, int x, int y)
130{ 125{
131 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 126 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
132 return; 127 return;
133 128
134 if (out_of_map (newmap, x, y)) 129 if (out_of_map (newmap, x, y))
135 { 130 {
136 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 131 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
151 146
152 // remove, so stupid ob_locked does not trigger a failure 147 // remove, so stupid ob_locked does not trigger a failure
153 remove (); 148 remove ();
154 149
155 /* try to find a spot for the player */ 150 /* try to find a spot for the player */
156 if (ob_blocked (this, newmap, x, y)) 151 if (blocked (newmap, x, y))
157 { /* First choice blocked */ 152 { /* First choice blocked */
158 /* We try to find a spot for the player, starting closest in. 153 /* 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, 154 * 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 155 * So for example, if the north space is free, you would always end up there even
161 * if other spaces around are available. 156 * if other spaces around are available.
… …
209 if (object *golem = contr->golem) 204 if (object *golem = contr->golem)
210 { 205 {
211 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 206 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
212 207
213 if (i < 0) 208 if (i < 0)
214 golem->destroy (); 209 golem->drop_and_destroy ();
215 else 210 else
216 { 211 {
217 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 212 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
218 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 213 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
219 } 214 }
… …
241 flag = 0; 236 flag = 0;
242 for_all_players (pl) 237 for_all_players (pl)
243 { 238 {
244 pl->refcnt_chk (); 239 pl->refcnt_chk ();
245 240
246 if (!pl->ob || !pl->ns || !pl->ob->active) 241 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
247 continue; 242 continue;
248 243
249 if (pl->ob->speed_left > 0 && pl->ns)
250 if (handle_newcs_player (pl->ob)) 244 if (handle_newcs_player (pl->ob))
251 flag = 1; 245 flag = 1;
252 246 }
253 /* If the player is not actively playing, don't make a 247 }
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 248
264 for_all_players (pl) 249 for_all_players (pl)
265 { 250 {
251 object *ob = pl->ob;
252
266 if (!pl->ob || !pl->ns || !pl->ob->active) 253 if (expect_false (!ob || !pl->ns || !ob->active))
267 continue; 254 continue;
268 255
269 if (settings.casting_time)
270 {
271 if (pl->ob->casting_time > 0)
272 {
273 pl->ob->casting_time--;
274 pl->ob->start_holding = 1;
275 }
276
277 /* set spell_state so we can update the range in stats field */
278 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
279 pl->ob->start_holding = 0;
280 }
281
282 do_some_living (pl->ob); 256 do_some_living (ob);
283 } 257 }
284} 258}
285 259
286static void 260static void
287process_players2 () 261process_players2 ()
288{ 262{
289 /* Then check if any players should use weapon-speed instead of speed */ 263 /* Then check if any players should use weapon-speed instead of speed */
290 for_all_players (pl) 264 for_all_players (pl)
291 { 265 {
292 /* The code that did weapon_sp handling here was out of place - 266 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
293 * this isn't called until after the player has finished there 267 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
294 * actions, and is thus out of place. All we do here is bounds
295 * checking.
296 */
297 if (pl->has_hit)
298 {
299 if (pl->ob->speed_left > pl->weapon_sp)
300 pl->ob->speed_left = pl->weapon_sp;
301
302 /* This needs to be here - if the player is running, we need to
303 * clear this each tick, but new commands are not being received
304 * so execute_newserver_command() is never called
305 */
306 pl->has_hit = 0;
307 }
308 else if (pl->ob->speed_left > pl->ob->speed)
309 pl->ob->speed_left = pl->ob->speed;
310 } 268 }
311} 269}
312 270
313void 271void
314process_events () 272process_events ()
… …
316 process_players1 (); 274 process_players1 ();
317 275
318 for_all_actives (op) 276 for_all_actives (op)
319 { 277 {
320 /* Now process op */ 278 /* Now process op */
321 if (QUERY_FLAG (op, FLAG_FREED)) 279 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
322 { 280 {
323 LOG (llevError, "BUG: process_events(): Free object on list\n"); 281 LOG (llevError, "BUG: process_events(): Free object on list\n");
324 op->set_speed (0); 282 op->set_speed (0);
325 continue; 283 continue;
326 } 284 }
327 285
328 if (!op->has_active_speed ()) 286 if (expect_false (!op->has_active_speed ()))
329 { 287 {
330 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 288 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
331 "but is on active list\n", op->debug_desc (), op->speed); 289 "but is on active list\n", op->debug_desc (), op->speed);
332 op->set_speed (0); 290 op->set_speed (0);
333 continue; 291 continue;
334 } 292 }
335 293
336 if (op->flag [FLAG_REMOVED]) 294 if (expect_false (op->flag [FLAG_REMOVED]))
337 { 295 {
338 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n", 296 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
339 op->debug_desc ()); 297 op->debug_desc ());
340 op->set_speed (0); 298 op->set_speed (0);
341 continue; 299 continue;
… …
344 /* Animate the object. Bug or feature that anim_speed 302 /* Animate the object. Bug or feature that anim_speed
345 * is based on ticks, and not the creatures speed? 303 * is based on ticks, and not the creatures speed?
346 */ 304 */
347 if (op->anim_speed && op->last_anim >= op->anim_speed) 305 if (op->anim_speed && op->last_anim >= op->anim_speed)
348 { 306 {
349 animate_object (op, op->type == PLAYER ? op->facing : op->direction); 307 animate_object (op, op->contr ? op->facing : op->direction);
350
351 op->last_anim = 1; 308 op->last_anim = 1;
352 } 309 }
353 else 310 else
354 op->last_anim++; 311 ++op->last_anim;
355 312
356 if (op->speed_left > 0) 313 if (expect_false (op->speed_left > 0.f))
357 {
358#if 0
359 /* I've seen occasional crashes in move_symptom() with it
360 * crashing because op is removed - add some debugging to
361 * track if it is removed at this point.
362 * This unfortunately is a bit too verbose it seems - not sure
363 * why - I think what happens is a map is freed or something and
364 * some objects get 'lost' - removed never to be reclaimed.
365 * removed objects generally shouldn't exist.
366 */
367 if (QUERY_FLAG (op, FLAG_REMOVED))
368 { 314 {
369 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
370 }
371#endif
372 --op->speed_left; 315 --op->speed_left;
373 process_object (op); 316 process_object (op);
374
375 if (op->destroyed ())
376 continue;
377 } 317 }
378 318
379 if (settings.casting_time == TRUE && op->casting_time > 0) 319 if (expect_true (!op->contr))
380 op->casting_time--; 320 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
381
382 if (op->speed_left <= 0)
383 op->speed_left += FABS (op->speed);
384 } 321 }
385 322
386 process_players2 (); 323 process_players2 ();
387} 324}
388 325
… …
402 339
403// send all clients some informational text 340// send all clients some informational text
404static void 341static void
405cleanup_inform (const char *cause, bool make_core) 342cleanup_inform (const char *cause, bool make_core)
406{ 343{
407 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN); 344 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
408 345
409 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n"); 346 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
410 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause); 347 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
411 348
412 if (make_core) 349 if (make_core)
413 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n"); 350 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
414 else 351 else
415 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"); 352 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
416 353
417 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 354 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
418 355
419 flush_sockets (); 356 client::flush_sockets ();
420} 357}
421 358
422/* clean up everything before exiting */ 359/* clean up everything before exiting */
423void 360void
424cleanup (const char *cause, bool make_core) 361cleanup (const char *cause, bool make_core)
… …
444 LOG (llevDebug, "running cleanup handlers.\n"); 381 LOG (llevDebug, "running cleanup handlers.\n");
445 INVOKE_GLOBAL (CLEANUP); 382 INVOKE_GLOBAL (CLEANUP);
446 383
447 LOG (llevDebug, "cleanup done.\n"); 384 LOG (llevDebug, "cleanup done.\n");
448 385
386 log_cleanup ();
387
449 if (make_core) 388 if (make_core)
450 {
451 cleanup_inform (cause, make_core); 389 cleanup_inform (cause, make_core);
452 cfperl_cleanup (make_core);
453 _exit (1);
454 }
455 else 390 else
456 { 391 {
457 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n"); 392 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
458 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n"); 393 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
459 flush_sockets (); 394 client::flush_sockets ();
395 }
396
460 cfperl_cleanup (make_core); 397 cfperl_cleanup (make_core);
461 _exit (0); 398 _exit (make_core);
462 }
463}
464
465int
466forbid_play (void)
467{
468#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
469 char buf[MAX_BUF], day[MAX_BUF];
470 FILE *fp;
471 time_t clock;
472 struct tm *tm;
473 int i, start, stop, forbit = 0, comp;
474
475 clock = time (NULL);
476 tm = (struct tm *) localtime (&clock);
477
478 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
479 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
480 return 0;
481
482 while (fgets (buf, MAX_BUF, fp))
483 {
484 if (buf[0] == '#')
485 continue;
486
487 if (!strncmp (buf, "msg", 3))
488 {
489 if (forbit)
490 while (fgets (buf, MAX_BUF, fp)) /* print message */
491 fputs (buf, logfile);
492 break;
493 }
494 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
495 {
496 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
497 continue;
498 }
499
500 for (i = 0; i < 7; i++)
501 {
502 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
503 forbit = 1;
504 }
505 }
506
507 close_and_delete (fp, comp);
508
509 return forbit;
510#else
511 return 0;
512#endif
513} 399}
514 400
515/* 401/*
516 * do_specials() is a collection of functions to call from time to time. 402 * do_specials() is a collection of functions to call from time to time.
517 * Modified 2000-1-14 MSW to use the global pticks count to determine how 403 * Modified 2000-1-14 MSW to use the global pticks count to determine how
… …
526 * doing the various things. 412 * doing the various things.
527 */ 413 */
528void 414void
529do_specials (void) 415do_specials (void)
530{ 416{
531 if (!(pticks % TICKS_PER_HOUR))
532 adjust_daylight ();
533
534 if (!(pticks % 7))
535 shstr::gc (); 417 shstr::gc ();
418 archetype::gc ();
536 419
420 if (expect_false (!(pticks % TICKS_PER_HOUR)))
421 maptile::adjust_daylight ();
422
537 if (!(pticks % 2503)) 423 if (expect_false (!(pticks % 2503)))
538 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 424 fix_weight (); /* Hack to fix weightproblems caused by bugs */
539 425
540 if (!(pticks % 5003)) 426 if (expect_false (!(pticks % 5003)))
541 write_book_archive (); 427 write_book_archive ();
542 428
543 if (!(pticks % 5009)) 429 if (expect_false (!(pticks % 5009)))
544 clean_friendly_list (); 430 clean_friendly_list ();
545 431
546 if (!(pticks % 5011)) 432 if (expect_false (!(pticks % 5011)))
547 obsolete_parties (); 433 obsolete_parties ();
548 434
549 if (!(pticks % 12503)) 435 if (expect_false (!(pticks % 12503)))
550 fix_luck (); 436 fix_luck ();
551} 437}
552 438
553void 439void
554server_tick () 440server_tick ()
555{ 441{
556 // first do the user visible stuff 442 // first do the user visible stuff
557 doeric_server ();
558 INVOKE_GLOBAL (CLOCK); 443 INVOKE_GLOBAL (CLOCK);
559 process_events (); /* "do" something with objects with speed */ 444 process_events (); // "do" something with objects with speed
560 flush_sockets (); 445 client::clock (); // draw client maps etc.
561 446
562 // then do some bookkeeping, should not really be here 447 // then do some bookkeeping, should not really be here
563 do_specials (); /* Routines called from time to time. */ 448 do_specials (); /* Routines called from time to time. */
564 attachable::check_mortals (); 449 attachable::check_mortals ();
565 450
… …
612 } 497 }
613} 498}
614 499
615#else 500#else
616 501
502#if 0 // just goofing around, look elsewhere
503
504#include <malloc.h>
505#include <execinfo.h>
506
507static void tr_on ();
508static void tr_off ();
509
510static SMUTEX(tr_mutex);
511
512#define ltr_off() SMUTEX_LOCK (tr_mutex); tr_off ()
513#define ltr_on() tr_on (); SMUTEX_UNLOCK (tr_mutex);
514
515static void *
516tr_malloc (size_t size, const void *caller)
517{
518 ltr_off ();
519
520 void *bt [8];
521 backtrace (bt, 8);
522
523 void *ptr = malloc (size);
524
525 ltr_on ();
526 return (char *)ptr;
527}
528
529static void
530tr_free (void *ptr, const void *caller)
531{
532 ltr_off ();
533
534 free (ptr);
535
536 ltr_on ();
537}
538
539void static *
540tr_realloc (void *ptr, size_t size, const void *caller)
541{
542 ltr_off ();
543
544 void *nptr = realloc (ptr, size);
545
546 ltr_on ();
547 return nptr;
548}
549
550static void *
551tr_memalign (size_t size, size_t alignment, const void *caller)
552{
553 ltr_off ();
554
555 void *ptr = memalign (size, alignment < 16 ? 16 : alignment);
556
557 ltr_on ();
558 return ptr;
559}
560
561static void
562tr_on ()
563{
564 __malloc_hook = tr_malloc;
565 __realloc_hook = tr_realloc;
566 __free_hook = tr_free;
567 __memalign_hook = tr_memalign;
568}
569
570static void
571tr_off ()
572{
573 __malloc_hook = 0;
574 __realloc_hook = 0;
575 __free_hook = 0;
576 __memalign_hook = 0;
577}
578
579void (*__malloc_initialize_hook)(void) = tr_on;
580
581#endif
582
617// normal main 583// normal main
618int 584int
619main (int argc, char **argv) 585main (int argc, char **argv)
620{ 586{
621 settings.argc = argc; 587 settings.argc = argc;
622 settings.argv = argv; 588 settings.argv = argv;
623 589
590 rndm.seed (time (0));
591 g_thread_init (0); // for the slice allocator only
592
624 init (argc, argv); 593 init (argc, argv);
625
626 initPlugins ();
627 594
628 for (;;) 595 for (;;)
629 cfperl_main (); 596 cfperl_main ();
630} 597}
631#endif 598#endif
632 599
600#if 0
601int xyzzy ()
602{
603 return rndm(8);
604}
605
606void xyzzy (object_ptr &a, object_ptr &o)
607{
608 asm volatile ("int3");
609 a = o;
610 asm volatile ("int3");
611}
612#endif
613

Diff Legend

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