X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=65780a0846643a2b98eaeec28519d8005ef5b0f2;hb=9ecb4e37407173333b466b42276a1764589505f0;hp=b9d5913fd1f2df0b5fa4f3fe7a19c14e385365fd;hpb=663badee5c884c9aebcd745e70891831ac658878;p=lugaru.git diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index b9d5913..65780a0 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -135,12 +135,12 @@ void Game::Dispose() } -void Game::LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool hasalpha){ +void Game::LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool hasalpha) { textures.push_back(TextureInfo(fileName,textureid,mipmap,hasalpha)); textures.back().load(); } -void Game::LoadTextureSave(const char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize){ +void Game::LoadTextureSave(const char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize) { textures.push_back(TextureInfo(fileName,textureid,mipmap,array,skinsize)); textures.back().load(); } @@ -776,9 +776,9 @@ void Game::InitGame() LOG("Initializing sound system..."); - int output = -1; - #if PLATFORM_LINUX + int output = -1; + extern bool cmdline(const char *cmd); unsigned char rc = 0; output = OPENAL_OUTPUT_ALSA; // Try alsa first...