nanopenguin/SDL_Minigame
0
0
Fork 0
mirror of https://github.com/Nimac0/SDL_Minigame synced 2026-01-12 12:33:43 +00:00
Code Actions Wiki

Merge remote-tracking branch 'origin/textureManagerChanges' into textureManagerChanges

Browse Source 
# Conflicts:
#	.gitmodules
#	CMakeLists.txt
#	include/AssetManager.h
#	include/Map.h
#	include/TileComponent.h
#	src/AssetManager.cpp
#	src/Map.cpp
#	src/TileComponent.cpp
This commit is contained in:
freezarite 2024-11-19 19:14:20 +01:00
commit 136196f6a5
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -6,6 +6,8 @@ Makefile
install_manifest.txt install_manifest.txt
.cache/ .cache/
build/ build/
cmake-build-debug/
.idea/
# Compiled files # Compiled files
*.suo *.suo

2
src/GameInternal.cpp
View File

@ -98,6 +98,8 @@ void GameInternal::init(const char* title, int xpos, int ypos, int width, int he
// loading music // loading music
// assets->addMusic("background_music", "assets/sound/background_music.mp3"); // assets->addMusic("background_music", "assets/sound/background_music.mp3");
this->gameInstance = GameFactory::instance().create(this); this->gameInstance = GameFactory::instance().create(this);
this->gameInstance->init(); this->gameInstance->init();
} }