… | |
… | |
40 | { |
40 | { |
41 | 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); |
42 | } |
42 | } |
43 | |
43 | |
44 | /* 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 |
45 | * savebed. We do some error checking - its possible that the |
45 | * savebed. |
46 | * savebed map may no longer exist, so we make sure the player |
|
|
47 | * goes someplace. |
|
|
48 | */ |
46 | */ |
49 | void |
47 | void |
50 | enter_player_savebed (object *op) |
48 | enter_player_savebed (object *op) |
51 | { |
49 | { |
52 | 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); |
… | |
… | |
57 | * 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 |
58 | * 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 |
59 | * whatever reason. If default map coordinates are to be used, then |
57 | * whatever reason. If default map coordinates are to be used, then |
60 | * the function that calls this should figure them out. |
58 | * the function that calls this should figure them out. |
61 | */ |
59 | */ |
62 | void |
60 | bool |
63 | object::enter_map (maptile *newmap, int x, int y) |
61 | object::enter_map (maptile *newmap, int x, int y) |
64 | { |
62 | { |
65 | if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE) |
63 | if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE) |
66 | return; |
64 | return false; |
67 | |
65 | |
68 | if (out_of_map (newmap, x, y)) |
66 | if (out_of_map (newmap, x, y)) |
69 | { |
67 | { |
70 | 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); |
71 | x = newmap->enter_x; |
69 | x = newmap->enter_x; |
… | |
… | |
73 | if (out_of_map (newmap, x, y)) |
71 | if (out_of_map (newmap, x, y)) |
74 | { |
72 | { |
75 | 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", |
76 | &newmap->path, x, y, newmap->width, newmap->height); |
74 | &newmap->path, x, y, newmap->width, newmap->height); |
77 | new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); |
75 | new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); |
78 | return; |
76 | return false; |
79 | } |
77 | } |
80 | } |
78 | } |
81 | |
79 | |
82 | if (contr && map != newmap && map) |
80 | if (contr && map != newmap && map) |
83 | if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) |
81 | if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) |
84 | return; |
82 | return false; |
85 | |
83 | |
86 | // remove, so stupid blocked does not trigger a failure |
84 | // remove, so stupid blocked does not trigger a failure |
87 | remove (); |
85 | remove (); |
88 | |
86 | |
89 | /* try to find a spot for the player */ |
87 | /* try to find a spot for the player */ |
… | |
… | |
105 | i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); |
103 | i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); |
106 | } |
104 | } |
107 | |
105 | |
108 | if (i >= 0) |
106 | if (i >= 0) |
109 | { |
107 | { |
110 | x += freearr_x[i]; |
108 | sint16 nx = x + freearr_x[i]; |
111 | y += freearr_y[i]; |
109 | sint16 ny = y + freearr_y[i]; |
|
|
110 | |
|
|
111 | if (xy_normalise (newmap, nx, ny)) |
|
|
112 | { |
|
|
113 | x = nx; |
|
|
114 | y = ny; |
|
|
115 | } |
112 | } |
116 | } |
113 | else |
117 | else |
114 | /* not much we can do in this case. */ |
118 | /* not much we can do in this case. */ |
115 | 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); |
119 | 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); |
116 | } |
120 | } |
117 | |
121 | |
118 | if (contr && map != newmap) |
122 | if (contr && map != newmap) |
119 | { |
123 | { |
120 | if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) |
124 | if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) |
121 | return; |
125 | return false; |
122 | |
126 | |
123 | if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) |
127 | if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) |
124 | return; |
128 | return false; |
125 | } |
129 | } |
126 | |
|
|
127 | newmap->insert (this, x, y, 0, INS_NO_WALK_ON); |
|
|
128 | |
130 | |
129 | enemy = 0; |
131 | enemy = 0; |
130 | |
132 | |
|
|
133 | //newmap->insert (this, x, y); |
|
|
134 | newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT); |
|
|
135 | |
|
|
136 | if (map == newmap) // see if we actually arrived there - insert might trigger a teleport |
|
|
137 | { |
131 | if (contr) |
138 | if (contr) |
132 | { |
139 | { |
133 | contr->maplevel = newmap->path; |
140 | contr->maplevel = newmap->path; |
134 | contr->count = 0; |
141 | contr->count = 0; |
135 | } |
|
|
136 | |
142 | |
137 | /* Update any golems */ |
143 | /* Update any golems */ |
138 | if (type == PLAYER) |
|
|
139 | if (object *golem = contr->golem) |
144 | if (object *golem = contr->golem) |
140 | { |
145 | { |
141 | int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); |
146 | int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); |
142 | |
147 | |
143 | if (i < 0) |
148 | if (i < 0) |
144 | golem->drop_and_destroy (); |
149 | golem->drop_and_destroy (); |
145 | else |
150 | else |
146 | { |
151 | { |
147 | newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); |
152 | newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); |
148 | golem->direction = find_dir_2 (golem->x - x, golem->y - y); |
153 | golem->direction = find_dir_2 (golem->x - x, golem->y - y); |
|
|
154 | } |
149 | } |
155 | } |
150 | } |
156 | } |
151 | |
157 | |
152 | /* since the players map is already loaded, we don't need to worry |
158 | /* since the players map is already loaded, we don't need to worry |
153 | * about pending objects. |
159 | * about pending objects. |
154 | */ |
160 | */ |
155 | remove_all_pets (newmap); |
161 | move_all_pets (); |
|
|
162 | |
|
|
163 | return true; |
|
|
164 | } |
|
|
165 | |
|
|
166 | return false; |
156 | } |
167 | } |
157 | |
168 | |
158 | /* process_players1 and process_players2 do all the player related stuff. |
169 | /* process_players1 and process_players2 do all the player related stuff. |
159 | * I moved it out of process events and process_map. This was to some |
170 | * I moved it out of process events and process_map. This was to some |
160 | * extent for debugging as well as to get a better idea of the time used |
171 | * extent for debugging as well as to get a better idea of the time used |
… | |
… | |
231 | } |
242 | } |
232 | |
243 | |
233 | /* Now process op */ |
244 | /* Now process op */ |
234 | if (expect_false (op->flag [FLAG_FREED])) |
245 | if (expect_false (op->flag [FLAG_FREED])) |
235 | { |
246 | { |
236 | LOG (llevError, "BUG: process_events(): Free object on list\n"); |
247 | LOG (llevError, "BUG: process_events(): Free object on list (%s)\n", op->debug_desc ()); |
237 | op->set_speed (0); |
248 | op->set_speed (0); |
238 | continue; |
249 | continue; |
239 | } |
250 | } |
240 | |
251 | |
241 | if (expect_false (!op->has_active_speed ())) |
252 | if (expect_false (!op->has_active_speed ())) |
… | |
… | |
282 | |
293 | |
283 | /* clean up everything before exiting */ |
294 | /* clean up everything before exiting */ |
284 | void |
295 | void |
285 | emergency_save () |
296 | emergency_save () |
286 | { |
297 | { |
287 | LOG (llevDebug, "emergency save begin.\n"); |
298 | LOG (llevInfo, "emergency_save: enter\n"); |
|
|
299 | |
|
|
300 | LOG (llevInfo, "emergency_save: saving book archive\n"); |
|
|
301 | write_book_archive (); |
288 | |
302 | |
289 | cfperl_emergency_save (); |
303 | cfperl_emergency_save (); |
290 | |
304 | |
291 | LOG (llevDebug, "saving book archive.\n"); |
|
|
292 | write_book_archive (); |
|
|
293 | |
|
|
294 | LOG (llevDebug, "emergency save done.\n"); |
305 | LOG (llevInfo, "emergency_save: leave\n"); |
295 | } |
306 | } |
296 | |
307 | |
297 | // send all clients some informational text |
308 | // send all clients some informational text |
298 | static void |
309 | static void |
299 | cleanup_inform (const char *cause, bool make_core) |
310 | cleanup_inform (const char *cause, bool make_core) |
… | |
… | |
318 | cleanup (const char *cause, bool make_core) |
329 | cleanup (const char *cause, bool make_core) |
319 | { |
330 | { |
320 | if (make_core) |
331 | if (make_core) |
321 | fork_abort (cause); |
332 | fork_abort (cause); |
322 | |
333 | |
323 | LOG (llevError, "cleanup cause: %s\n", cause); |
334 | LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause); |
324 | |
335 | |
325 | if (!make_core) |
336 | if (!make_core) |
326 | cleanup_inform (cause, make_core); |
337 | cleanup_inform (cause, make_core); |
327 | |
338 | |
328 | LOG (llevDebug, "cleanup begin.\n"); |
339 | LOG (llevDebug, "cleanup begin.\n"); |