#include <fstream>
#include <stdexcept>
-#include "app/globals.h"
#include "sector.h"
#include "player_status.h"
#include "object/gameobjs.h"
#include "lisp/list_iterator.h"
#include "tile.h"
#include "audio/sound_manager.h"
-#include "gameloop.h"
+#include "game_session.h"
#include "resources.h"
#include "statistics.h"
#include "collision_grid.h"
#include "collision_grid_iterator.h"
#include "object_factory.h"
-#include "special/collision.h"
-#include "math/rectangle.h"
+#include "collision.h"
+#include "math/rect.h"
#include "math/aatriangle.h"
#include "object/coin.h"
#include "object/block.h"
camera->reset(player->get_pos());
}
-Rectangle
+Rect
Sector::get_active_region()
{
- return Rectangle(
+ return Rect(
camera->get_translation() - Vector(1600, 1200),
camera->get_translation() + Vector(1600, 1200));
}
int max_y = int(y2+1);
CollisionHit temphit, hit;
- Rectangle dest = object->get_bbox();
+ Rect dest = object->get_bbox();
dest.move(object->movement);
hit.time = -1; // represents an invalid value
for(int x = starttilex; x*32 < max_x; ++x) {
hit = temphit;
}
} else { // normal rectangular tile
- Rectangle rect(x*32, y*32, (x+1)*32, (y+1)*32);
+ Rect rect(x*32, y*32, (x+1)*32, (y+1)*32);
if(Collision::rectangle_rectangle(temphit, dest,
object->movement, rect)) {
if(temphit.time > hit.time)
Sector::collision_object(MovingObject* object1, MovingObject* object2)
{
CollisionHit hit;
- Rectangle dest1 = object1->get_bbox();
+ Rect dest1 = object1->get_bbox();
dest1.move(object1->get_movement());
- Rectangle dest2 = object2->get_bbox();
+ Rect dest2 = object2->get_bbox();
dest2.move(object2->get_movement());
Vector movement = object1->get_movement() - object2->get_movement();
}
add_object(new_bullet);
- SoundManager::get()->play_sound(IDToSound(SND_SHOOT));
+ sound_manager->play_sound("shoot");
return true;
}
void
Sector::load_music()
{
- char* song_path;
- char* song_subtitle;
-
- level_song = SoundManager::get()->load_music(datadir + "/music/" + song_title);
-
- song_path = (char *) malloc(sizeof(char) * datadir.length() +
- strlen(song_title.c_str()) + 8 + 5);
- song_subtitle = strdup(song_title.c_str());
- strcpy(strstr(song_subtitle, "."), "\0");
- sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(),
- song_subtitle, strstr(song_title.c_str(), "."));
- if(!SoundManager::get()->exists_music(song_path)) {
- level_song_fast = level_song;
- } else {
- level_song_fast = SoundManager::get()->load_music(song_path);
- }
- free(song_subtitle);
- free(song_path);
+ level_song = sound_manager->load_music(
+ get_resource_filename("/music/" + song_title));
}
void
-Sector::play_music(int type)
+Sector::play_music(MusicType type)
{
currentmusic = type;
switch(currentmusic) {
- case HURRYUP_MUSIC:
- SoundManager::get()->play_music(level_song_fast);
- break;
case LEVEL_MUSIC:
- SoundManager::get()->play_music(level_song);
+ sound_manager->play_music(level_song);
break;
case HERRING_MUSIC:
- SoundManager::get()->play_music(herring_song);
+ sound_manager->play_music(herring_song);
break;
default:
- SoundManager::get()->halt_music();
+ sound_manager->halt_music();
break;
}
}
-int
+MusicType
Sector::get_music_type()
{
return currentmusic;
}
bool
-Sector::inside(const Rectangle& rect) const
+Sector::inside(const Rect& rect) const
{
if(rect.p1.x > solids->get_width() * 32
|| rect.p1.y > solids->get_height() * 32