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,2009,2010,2011,2012 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 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992 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> |
… | |
… | |
104 | } |
104 | } |
105 | |
105 | |
106 | if (i >= 0) |
106 | if (i >= 0) |
107 | { |
107 | { |
108 | maptile *m = newmap; |
108 | maptile *m = newmap; |
109 | sint16 nx = x + freearr_x[i]; |
109 | sint16 nx = x + DIRX (i); |
110 | sint16 ny = y + freearr_y[i]; |
110 | sint16 ny = y + DIRY (i); |
111 | |
111 | |
112 | if (xy_normalise (m, nx, ny)) |
112 | if (xy_normalise (m, nx, ny)) |
113 | { |
113 | { |
114 | newmap = m; |
114 | newmap = m; |
115 | x = nx; |
115 | x = nx; |
… | |
… | |
151 | |
151 | |
152 | if (i < 0) |
152 | if (i < 0) |
153 | golem->drop_and_destroy (); |
153 | golem->drop_and_destroy (); |
154 | else |
154 | else |
155 | { |
155 | { |
156 | newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); |
156 | newmap->insert (golem, x + DIRX (i), y + DIRY (i)); |
157 | golem->direction = find_dir_2 (golem->x - x, golem->y - y); |
157 | golem->direction = find_dir_2 (golem->x - x, golem->y - y); |
158 | } |
158 | } |
159 | } |
159 | } |
160 | } |
160 | } |
161 | |
161 | |
… | |
… | |
431 | { |
431 | { |
432 | settings.argc = argc; |
432 | settings.argc = argc; |
433 | settings.argv = argv; |
433 | settings.argv = argv; |
434 | |
434 | |
435 | rndm.seed (time (0)); |
435 | rndm.seed (time (0)); |
436 | g_thread_init (0); // for the slice allocator only |
|
|
437 | |
436 | |
438 | // temporary(?) testing hack |
437 | // temporary(?) testing hack |
439 | if (argc >= 2 && !strcmp (argv [1], "--noise")) |
438 | if (argc >= 2 && !strcmp (argv [1], "--noise")) |
440 | { |
439 | { |
441 | void noise_test (); |
440 | void noise_test (); |