Subversion Repositories spk

Rev

Rev 11 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 11 Rev 123
Line 102... Line 102...
102 
		{
 102 
		{
103 
			CyString file = rest;
 103 
			CyString file = rest;
104 
			file = file.FindReplace ( "\\", "/" );
 104 
			file = file.FindReplace ( "\\", "/" );
105 
			file.RemoveSpaces ();
 105 
			file.RemoveSpaces ();
106 
 
 106 
 
- 
 
 107 
#ifdef FMOD
107 
			if ( overlay->CreateSound ( file ) )
 108 
			if ( overlay->CreateSound ( file ) )
108 
			{
 109 
			{
109 
				SMOSound *s = new SMOSound;
 110 
				SMOSound *s = new SMOSound;
110 
				s->sFilename = file;
 111 
				s->sFilename = file;
111 
				AddMouseEvent ( section, s );
 112 
				AddMouseEvent ( section, s );
112 
			}
 113 
			}
- 
 
 114 
#endif
113 
		}
 115 
		}
114 
		else if ( cmd == "COLOUR" )
 116 
		else if ( cmd == "COLOUR" )
115 
		{
 117 
		{
116 
			SMOColour *c = new SMOColour;
 118 
			SMOColour *c = new SMOColour;
117 
			c->iColour[0] = rest.GetToken ( ",", 1, 1 ).ConvertEquation();
 119 
			c->iColour[0] = rest.GetToken ( ",", 1, 1 ).ConvertEquation();
Line 284... Line 286...
284 
				ret = 1;
 286 
				ret = 1;
285 
			else if ( (b) && (!mo->bStarted) )
 287 
			else if ( (b) && (!mo->bStarted) )
286 
			{
 288 
			{
287 
				if ( mo->iType == MO_SOUND )
 289 
				if ( mo->iType == MO_SOUND )
288 
				{
 290 
				{
- 
 
 291 
#ifdef FMOD
289 
					SMOSound *s = (SMOSound *)mo;
 292 
					SMOSound *s = (SMOSound *)mo;
290 
					overlay->PlaySound ( s->sFilename );
 293 
					overlay->PlaySound ( s->sFilename );
- 
 
 294 
#endif
291 
				}
 295 
				}
292 
				else if ( mo->iType == MO_SWITCHVARIABLE )
 296 
				else if ( mo->iType == MO_SWITCHVARIABLE )
293 
				{
 297 
				{
294 
					SMOSwitchV *s = (SMOSwitchV *)mo;
 298 
					SMOSwitchV *s = (SMOSwitchV *)mo;
295 
					// find the varible to switch
 299 
					// find the varible to switch
Line 374... Line 378...
374 
			if ( m_bMouseOver )
 378 
			if ( m_bMouseOver )
375 
			{
 379 
			{
376 
				if ( (mo->iType == MO_SOUND) && (!((SMOSound *)mo)->bStarted) )
 380 
				if ( (mo->iType == MO_SOUND) && (!((SMOSound *)mo)->bStarted) )
377 
				{
 381 
				{
378 
					SMOSound *s = (SMOSound *)mo;
 382 
					SMOSound *s = (SMOSound *)mo;
- 
 
 383 
#ifdef FMOD
379 
					overlay->PlaySound ( s->sFilename );
 384 
					overlay->PlaySound ( s->sFilename );
- 
 
 385 
#endif
380 
					s->bStarted = true;
 386 
					s->bStarted = true;
381 
				}
 387 
				}
382 
			}
 388 
			}
383 
			else
 389 
			else
384 
			{
 390 
			{