Zeronaut/KaijuSaveEarth
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up git merge on Game.cpp added assets

Browse Source
This commit is contained in:
Alan Youngblood
2023-08-12 23:27:14 -04:00
parent ff1863182e
commit 6bdaefdeb9
7 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/Game.cpp
View File

@@ -145,7 +145,6 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
}
std::string kaijuTex = Game::projPath + "assets/textures/actors/kaijuturtle.png";
<<<<<<< HEAD
std::string fontTex = Game::projPath + "assets/textures/ui/ui-font-lorez5.png";
std::string textBoxTex = Game::projPath + "assets/textures/ui/ui-element-bubble.png";
std::string musicFile = Game::projPath + "assets/audio/music/sillypuppy.ogg";
@@ -154,13 +153,6 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
assets->AddTexture("player", kaijuTex.c_str());
assets->AddTexture("font", fontTex.c_str());
assets->AddTexture("textBox", textBoxTex.c_str());
=======
assets->AddTexture("player", kaijuTex.c_str());
assets->AddTexture("font", "assets/textures/ui/ui-font-lorez5.png");
assets->AddTexture("textBox", "assets/textures/ui/ui-element-bubble.png");
assets->AddTexture("collider","assets/textures/ColTex.png");
>>>>>>> f449eda43f6cbd3f90508029e94741f4c2de1f9b
assets->AddMusicTrack("simonZ",musicFile.c_str());