Réparation du Merge du Pause
This commit is contained in:
		| @@ -429,10 +429,12 @@ void Engine::LoadResource() { | ||||
|  | ||||
| 	LoadTexture(MenuTitleTexture, TEXTURE_PATH "BrouillonbackgroundMenu.png"); | ||||
| 	LoadTexture(MenuBGTexture, TEXTURE_PATH "BrouillonbackgroundMenu.png"); | ||||
| 	LoadTexture(PauseBGTexture, TEXTURE_PATH "BrouillonbackgroundMenu.png"); | ||||
| 	LoadTexture(SplachScreenTexture, TEXTURE_PATH "sc2.png"); | ||||
| 	LoadTexture(MenuQuitTexture, MENU_ITEM_PATH "BasicQuit.png"); | ||||
| 	LoadTexture(MenuOptionsTexture, MENU_ITEM_PATH "test.png"); | ||||
| 	LoadTexture(MenuStartTexture, MENU_ITEM_PATH "BasicPlay.png"); | ||||
|  | ||||
| 	TextureAtlas::TextureIndex texDirtIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "metal3.png"); | ||||
| 	TextureAtlas::TextureIndex texIceIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "metal2.png"); | ||||
| 	TextureAtlas::TextureIndex texGrassIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "grass.png"); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user