diff --git a/src/level.cpp b/src/level.cpp index 2242776..3ee44b9 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -32,12 +32,6 @@ using namespace std; LEVEL::LEVEL() { -/* - consoleHistory[0] = "hello0"; - consoleHistory[1] = "hello1"; - consoleHistory[MAX_CONSOLE_HISTORY_LINES-2] = "hello3"; - consoleHistory[MAX_CONSOLE_HISTORY_LINES-1] = "hello4"; -*/ textureNames = NULL; numTextures = 0; textures = NULL; @@ -62,7 +56,7 @@ LEVEL::LEVEL() //Player Stuff mouseSpeed = 5; turnSpeed = 1.0f; - moveSpeed = .2f; + moveSpeed = 0.2f; mlook = true; } @@ -95,8 +89,11 @@ bool LEVEL::LoadMap(string mapname) strcpy(tmpChar, "Unable to load level file "); strcat(tmpChar, mapname.c_str()); strcat(tmpChar, " doesn't exist."); - + + //This needs to be abstracted somehow + #ifdef WIN32 MessageBox(NULL,tmpChar,"ERROR",MB_OK|MB_ICONEXCLAMATION); + #endif delete [] tmpChar; return false; } @@ -174,10 +171,13 @@ bool LEVEL::LoadMap(string mapname) { ConsolePrint("Starting sound"); + //This needs to be abstracted somehow + #ifdef WIN32 BASS_Init(-1, 44100, BASS_DEVICE_LEAVEVOL, g_hWnd); BASS_Start(); BASS_CDInit(NULL, BASS_DEVICE_LEAVEVOL); - + #endif + if(bgm.length()>=4) { if( toupper(bgm[0]) == 'C' && @@ -185,19 +185,29 @@ bool LEVEL::LoadMap(string mapname) toupper(bgm[2]) == 'A') { bgmCDA = Integer(bgm.substr(3,bgm.length())); + //This needs to be abstracted somehow + #ifdef WIN32 BASS_CDPlay(bgmCDA, 1, 0); + #endif } else { bgmCDA=0; string tmpstr = gamedir + "music/bgm/" + bgm; + //This needs to be abstracted somehow + #ifdef WIN32 bgmStream = BASS_StreamCreateFile(0, (void*)tmpstr.c_str(), 0, 0, BASS_STREAM_AUTOFREE); BASS_StreamPlay(bgmStream, 1, BASS_SAMPLE_LOOP); + #endif } } ConsolePrint("Sound init complete"); } + else + { + ConsolePrint("Sound disabled"); + } return true; } @@ -224,7 +234,10 @@ void LEVEL::SaveMap(string mapname) strcat(tmpChar, mapname.c_str()); strcat(tmpChar, " already exists."); + //This needs to be abstracted somehow + #ifdef WIN32 MessageBox(NULL,tmpChar,"ERROR",MB_OK|MB_ICONEXCLAMATION); + #endif delete [] tmpChar; return; } @@ -359,7 +372,8 @@ void LEVEL::Render() //render the console background //render the console output text - for(unsigned int i=0; i