Subversion Repositories spk

Rev

Rev 11 | Rev 123 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 11 Rev 79
Line 99... Line 99...
99 
				return s->pSound;
 99 
				return s->pSound;
100 
		}
 100 
		}
101 
 
 101 
 
102 
		s = new SStoredSound;
 102 
		s = new SStoredSound;
103 
		s->sFilename = filename;
 103 
		s->sFilename = filename;
- 
 
 104 
		//TODO: update this to new FMOD lib to fix this
- 
 
 105 
		/*
104 
		FMOD_RESULT result = m_pSystem->createSound ( filename.c_str(), FMOD_HARDWARE, 0, &s->pSound );
 106 
		FMOD_RESULT result = m_pSystem->createSound ( filename.c_str(), FMOD_HARDWARE, 0, &s->pSound );
105 
		if ( result == FMOD_OK )
 107 
		if ( result == FMOD_OK )
106 
		{
 108 
		{
107 
			m_lSounds.push_back ( s );
 109 
			m_lSounds.push_back ( s );
108 
			return s->pSound;
 110 
			return s->pSound;
109 
		}
 111 
		}*/
110 
		delete s;
 112 
		delete s;
111 
		return NULL;
 113 
		return NULL;
112 
	}
 114 
	}
113 
 
 115 
 
114 
	void MoveMouseY ( int y ) { m_iMouseY += y; if ( m_iMouseY > m_iHeight ) m_iMouseY = m_iHeight; if ( m_iMouseY < 0 ) m_iMouseY = 0; }
 116 
	void MoveMouseY ( int y ) { m_iMouseY += y; if ( m_iMouseY > m_iHeight ) m_iMouseY = m_iHeight; if ( m_iMouseY < 0 ) m_iMouseY = 0; }
Line 216... Line 218...
216 
	virtual bool PlaySound ( SStoredSound *sound )
 218 
	virtual bool PlaySound ( SStoredSound *sound )
217 
	{
 219 
	{
218 
		if ( !sound )
 220 
		if ( !sound )
219 
			return false;
 221 
			return false;
220
222
- 
 
 223 
		//TODO: update to work with latest FMOD
- 
 
 224 
		/*
221 
		FMOD_RESULT result = m_pSystem->playSound ( FMOD_CHANNEL_FREE, sound->pSound, false, &sound->pChannel );
 225 
		FMOD_RESULT result = m_pSystem->playSound ( FMOD_CHANNEL_FREE, sound->pSound, false, &sound->pChannel );
222 
		if ( result == FMOD_OK )
 226 
		if ( result == FMOD_OK )
223 
			return true;
 227 
			return true;
- 
 
 228 
			*/
224 
		return false;
 229 
		return false;
225 
	}
 230 
	}
226 
 
 231 
 
227 
	int m_iWidth, m_iHeight;
 232 
	int m_iWidth, m_iHeight;
228 
 
 233