| … | |
… | |
| 187 | |
187 | |
| 188 | for_all_players (pl) |
188 | for_all_players (pl) |
| 189 | { |
189 | { |
| 190 | object *ob = pl->ob; |
190 | object *ob = pl->ob; |
| 191 | |
191 | |
|
|
192 | // process_objects destroys the speed_left value |
|
|
193 | pl->speed_left_save = ob->speed_left; |
|
|
194 | |
| 192 | if (expect_false (!ob || !pl->ns || !ob->active)) |
195 | if (expect_false (!ob || !pl->ns || !ob->active)) |
| 193 | continue; |
196 | continue; |
| 194 | |
197 | |
| 195 | do_some_living (ob); |
198 | do_some_living (ob); |
| 196 | } |
199 | } |
| … | |
… | |
| 200 | process_players2 () |
203 | process_players2 () |
| 201 | { |
204 | { |
| 202 | /* 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 */ |
| 203 | for_all_players (pl) |
206 | for_all_players (pl) |
| 204 | { |
207 | { |
|
|
208 | // restore speed_left value saved by process_players1 |
|
|
209 | pl->ob->speed_left = pl->speed_left_save; |
|
|
210 | |
| 205 | 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); |
| 206 | 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); |
| 207 | } |
213 | } |
| 208 | } |
214 | } |
| 209 | |
215 | |
| … | |
… | |
| 212 | { |
218 | { |
| 213 | process_players1 (); |
219 | process_players1 (); |
| 214 | |
220 | |
| 215 | for_all_actives (op) |
221 | for_all_actives (op) |
| 216 | { |
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 | |
| 217 | /* Now process op */ |
237 | /* Now process op */ |
| 218 | if (expect_false (QUERY_FLAG (op, FLAG_FREED))) |
238 | if (expect_false (QUERY_FLAG (op, FLAG_FREED))) |
| 219 | { |
239 | { |
| 220 | LOG (llevError, "BUG: process_events(): Free object on list\n"); |
240 | LOG (llevError, "BUG: process_events(): Free object on list\n"); |
| 221 | op->set_speed (0); |
241 | op->set_speed (0); |
| … | |
… | |
| 253 | { |
273 | { |
| 254 | --op->speed_left; |
274 | --op->speed_left; |
| 255 | process_object (op); |
275 | process_object (op); |
| 256 | } |
276 | } |
| 257 | |
277 | |
| 258 | 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. |
| 259 | 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)); |
| 260 | } |
282 | } |
| 261 | |
283 | |
| 262 | process_players2 (); |
284 | process_players2 (); |
| 263 | } |
285 | } |
| 264 | |
286 | |
