Compare commits
No commits in common. "bcdd633d53586316e817b5f8ad57328bc6d3673f" and "654142ae809c086f9cd11438e435b26750d0b72b" have entirely different histories.
bcdd633d53
...
654142ae80
@ -142,15 +142,18 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
|
|||||||
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Couldn't initialize SDL audio mixer!, Error: %s", SDL_GetError());
|
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Couldn't initialize SDL audio mixer!, Error: %s", SDL_GetError());
|
||||||
}
|
}
|
||||||
|
|
||||||
assets->AddTexture("player", "assets/textures/actors/kaijuturtle.png");
|
assets->AddTexture("player", "assets/textures/actors/firefighter.png");
|
||||||
assets->AddTexture("font", "assets/textures/ui/ui-font-lorez5.png");
|
assets->AddTexture("font", "assets/textures/ui/ui-font-lorez5.png");
|
||||||
assets->AddTexture("textBox", "assets/textures/ui/ui-element-bubble.png");
|
assets->AddTexture("textBox", "assets/textures/ui/ui-element-bubble.png");
|
||||||
|
assets->AddTexture("puppy","assets/textures/actors/beaglepuppy.png");
|
||||||
assets->AddTexture("collider","assets/textures/ColTex.png");
|
assets->AddTexture("collider","assets/textures/ColTex.png");
|
||||||
|
|
||||||
assets->AddMusicTrack("simonZ","assets/audio/music/sillypuppy.ogg");
|
assets->AddMusicTrack("simonZ","assets/audio/music/sillypuppy.ogg");
|
||||||
assets->AddMusicTrack("simonZ","assets/audio/music/victory.ogg");
|
assets->AddMusicTrack("simonZ","assets/audio/music/victory.ogg");
|
||||||
|
|
||||||
assets->AddSoundClip("bwoop","assets/audio/sfx/bwoop.wav");
|
assets->AddSoundClip("bwoop","assets/audio/sfx/bwoop.wav");
|
||||||
|
assets->AddSoundClip("bark1","assets/audio/sfx/Bark1.wav");
|
||||||
|
assets->AddSoundClip("bark2","assets/audio/sfx/Bark2.wav");
|
||||||
|
|
||||||
// map = new Map("terrain",globalScale,16);
|
// map = new Map("terrain",globalScale,16);
|
||||||
// std::string myText = "Find lost puppies!\nThey need your help!";
|
// std::string myText = "Find lost puppies!\nThey need your help!";
|
||||||
|
Loading…
Reference in New Issue
Block a user