X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameDraw.cpp;h=ec4ec3f6e7d96eef6eed0d4d153e60c962c4141b;hb=92a6a5b3deaa3c03ab40851496b73bcdbba22fee;hp=1275a45a6f2c843e4461804c6c323ff2ae2c93c3;hpb=9a5f2758e538d9216d255b4797f042a1b6874272;p=lugaru.git

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 1275a45..ec4ec3f 100644
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -19,7 +19,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "Game.h"	
+#include "Game.h"
+#include "openal_wrapper.h"
 
 using namespace std;
 
@@ -174,9 +175,9 @@ extern float accountcampaigntime[10];
 
 extern bool gamestarted;
 
-extern FSOUND_SAMPLE	*samp[100];
+extern OPENAL_SAMPLE	*samp[100];
 extern int channels[100];
-extern "C" 	void PlaySoundEx(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
+extern "C" 	void PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
 
 /*********************> DrawGLScene() <*****/
 long long Game::MD5_string (char *string){
@@ -1093,9 +1094,9 @@ int Game::DrawGLScene(void)
 								if(dialogueboxsound[whichdialogue][indialogue]==-3)whichsoundplay=consolesuccesssound;
 								if(dialogueboxsound[whichdialogue][indialogue]==-4)whichsoundplay=consolefailsound;
 								PlaySoundEx( whichsoundplay, samp[whichsoundplay], NULL, true);
-								FSOUND_3D_SetAttributes(channels[whichsoundplay], gLoc, vel);
-								FSOUND_SetVolume(channels[whichsoundplay], 256);
-								FSOUND_SetPaused(channels[whichsoundplay], false);
+								OPENAL_3D_SetAttributes(channels[whichsoundplay], gLoc, vel);
+								OPENAL_SetVolume(channels[whichsoundplay], 256);
+								OPENAL_SetPaused(channels[whichsoundplay], false);
 							}
 						}
 					}
@@ -2505,7 +2506,7 @@ int Game::DrawGLScene(void)
 				movex[10]=0;
 				movey[10]=0;
 				
-				sprintf (menustring[11], "Volume: %d%", (int)(volume*100));
+				sprintf (menustring[11], "Volume: %d%%", (int)(volume*100));
 				startx[11]=10+60;
 				starty[11]=155;
 				endx[11]=startx[11]+strlen(menustring[11])*10;
@@ -2687,7 +2688,7 @@ int Game::DrawGLScene(void)
 
 				if(accountcampaignchoicesmade[accountactive])
 					for(i=0;i<accountcampaignchoicesmade[accountactive];i++){
-						sprintf (menustring[7+i], campaigndescription[levelorder[i]]);
+						sprintf (menustring[7+i], "%s", campaigndescription[levelorder[i]]);
 						startx[7+i]=30+120+campaignlocationx[levelorder[i]]*400/512;
 						starty[7+i]=30+30+(512-campaignlocationy[levelorder[i]])*400/512;
 						endx[7+i]=startx[7+i]+10;
@@ -2698,7 +2699,7 @@ int Game::DrawGLScene(void)
 
 					if(campaignchoicenum>0)
 						for(i=accountcampaignchoicesmade[accountactive];i<accountcampaignchoicesmade[accountactive]+campaignchoicenum;i++){
-							sprintf (menustring[7+i], campaigndescription[levelorder[i]]);
+							sprintf (menustring[7+i], "%s", campaigndescription[levelorder[i]]);
 							startx[7+i]=30+120+campaignlocationx[campaignchoicewhich[i-(accountcampaignchoicesmade[accountactive])]]*400/512;
 							starty[7+i]=30+30+(512-campaignlocationy[campaignchoicewhich[i-(accountcampaignchoicesmade[accountactive])]])*400/512;
 							endx[7+i]=startx[7+i]+10;