… | |
… | |
33 | |
33 | |
34 | #include <../random_maps/random_map.h> |
34 | #include <../random_maps/random_map.h> |
35 | #include <../random_maps/rproto.h> |
35 | #include <../random_maps/rproto.h> |
36 | #include "path.h" |
36 | #include "path.h" |
37 | |
37 | |
38 | static char days[7][4] = { |
|
|
39 | "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" |
|
|
40 | }; |
|
|
41 | |
|
|
42 | void |
38 | void |
43 | version (object *op) |
39 | version (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 | } |
42 | } |
… | |
… | |
191 | |
187 | |
192 | for_all_players (pl) |
188 | for_all_players (pl) |
193 | { |
189 | { |
194 | object *ob = pl->ob; |
190 | object *ob = pl->ob; |
195 | |
191 | |
|
|
192 | // process_objects destroys the speed_left value |
|
|
193 | pl->speed_left_save = ob->speed_left; |
|
|
194 | |
196 | if (expect_false (!ob || !pl->ns || !ob->active)) |
195 | if (expect_false (!ob || !pl->ns || !ob->active)) |
197 | continue; |
196 | continue; |
198 | |
197 | |
199 | do_some_living (ob); |
198 | do_some_living (ob); |
200 | } |
199 | } |
… | |
… | |
204 | process_players2 () |
203 | process_players2 () |
205 | { |
204 | { |
206 | /* Then check if any players should use weapon-speed instead of speed */ |
205 | /* Then check if any players should use weapon-speed instead of speed */ |
207 | for_all_players (pl) |
206 | for_all_players (pl) |
208 | { |
207 | { |
|
|
208 | // restore speed_left value saved by process_players1 |
|
|
209 | pl->ob->speed_left = pl->speed_left_save; |
|
|
210 | |
209 | pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp); |
211 | pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp); |
210 | pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); |
212 | pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); |
211 | } |
213 | } |
212 | } |
214 | } |
213 | |
215 | |
214 | void |
216 | static void |
215 | process_events () |
217 | process_events () |
216 | { |
218 | { |
217 | process_players1 (); |
219 | process_players1 (); |
218 | |
220 | |
219 | for_all_actives (op) |
221 | for_all_actives (op) |
220 | { |
222 | { |
|
|
223 | // try to prefetch some stuff we expect to need |
|
|
224 | // obviously, it should be grouped into the same cacheline. |
|
|
225 | // preliminary results indicate that this gives halves the speed |
|
|
226 | // used for the inner loop |
|
|
227 | if (_i < actives.size ()) // HACK, rely on _i :/ |
|
|
228 | { |
|
|
229 | object *next = actives [_i + 1]; |
|
|
230 | |
|
|
231 | prefetch (&next->flag , 0, 1); |
|
|
232 | prefetch (&next->speed , 0, 1); |
|
|
233 | prefetch (&next->anim_speed, 0, 1); |
|
|
234 | prefetch (&next->contr , 0, 1); |
|
|
235 | } |
|
|
236 | |
221 | /* Now process op */ |
237 | /* Now process op */ |
222 | if (expect_false (QUERY_FLAG (op, FLAG_FREED))) |
238 | if (expect_false (QUERY_FLAG (op, FLAG_FREED))) |
223 | { |
239 | { |
224 | LOG (llevError, "BUG: process_events(): Free object on list\n"); |
240 | LOG (llevError, "BUG: process_events(): Free object on list\n"); |
225 | op->set_speed (0); |
241 | op->set_speed (0); |
… | |
… | |
257 | { |
273 | { |
258 | --op->speed_left; |
274 | --op->speed_left; |
259 | process_object (op); |
275 | process_object (op); |
260 | } |
276 | } |
261 | |
277 | |
262 | if (expect_true (!op->contr)) |
278 | // this will destroy the speed_left value for players, but |
|
|
279 | // process_players1 and ..2 save/restore the real value, |
|
|
280 | // so we can avoid a costly test here. |
263 | op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); |
281 | op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); |
264 | } |
282 | } |
265 | |
283 | |
266 | process_players2 (); |
284 | process_players2 (); |
267 | } |
285 | } |
268 | |
286 | |