#include <float.h>
#include <math.h>
#include <limits>
-#include <physfs.h>
+//#include <physfs.h>
+#include <unison/vfs/FileSystem.hpp>
#include "sector.hpp"
#include "object/player.hpp"
if (backgroundimage == "arctis2.jpg") backgroundimage = "arctis.jpg";
if (backgroundimage == "ocean.png") backgroundimage = "ocean.jpg";
backgroundimage = "images/background/" + backgroundimage;
- if (!PHYSFS_exists(backgroundimage.c_str())) {
+ if (!Unison::VFS::FileSystem::get().exists(backgroundimage)) {
log_warning << "Background image \"" << backgroundimage << "\" not found. Ignoring." << std::endl;
backgroundimage = "";
}
return;
// calculate intersection
- float itop = r1.get_bottom() - r2.get_top();
+ float itop = r1.get_bottom() - r2.get_top();
float ibottom = r2.get_bottom() - r1.get_top();
- float ileft = r1.get_right() - r2.get_left();
- float iright = r2.get_right() - r1.get_left();
+ float ileft = r1.get_right() - r2.get_left();
+ float iright = r2.get_right() - r1.get_left();
if(fabsf(movement.y) > fabsf(movement.x)) {
if(ileft < SHIFT_DELTA) {
get_hit_normal(moving_object->dest, moving_object_2->dest,
hit, normal);
if(!moving_object->collides(*moving_object_2, hit))
- return;
+ continue;
if(!moving_object_2->collides(*moving_object, hit))
- return;
+ continue;
moving_object->collision(*moving_object_2, hit);
moving_object_2->collision(*moving_object, hit);