martin
/
fysxasteroids
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added printing of error message when initializing sound, fixed font spacing the millionth time

main
Martin Felis (berta) 2010-11-15 22:49:35 +01:00
parent e981f68a9c
commit 652367b824
5 changed files with 2328 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
asteroids/View.cc
View File

@ -556,6 +556,7 @@ void View::DrawUiHighscore() {
unsigned int entry_length = 32; unsigned int entry_length = 32;
float char_width, height; float char_width, height;
DrawGLStringMeasure ("M", &char_width, &height); DrawGLStringMeasure ("M", &char_width, &height);
height = fabsf(height);
float entry_width = fabsf(char_width * entry_length); float entry_width = fabsf(char_width * entry_length);
float x = screen_right * 0.5 - entry_width * 0.5; float x = screen_right * 0.5 - entry_width * 0.5;
float y = screen_bottom * 0.5 - 8 - 128; float y = screen_bottom * 0.5 - 8 - 128;
@ -580,7 +581,7 @@ void View::DrawUiHighscore() {
DrawHighscoreEntry ( x, y, entry_width, highscore_iter->name, highscore_iter->points); DrawHighscoreEntry ( x, y, entry_width, highscore_iter->name, highscore_iter->points);
// go down one line // go down one line
y += 20; y += height * 1.3;
i++; i++;
highscore_iter++; highscore_iter++;

1
data/levels/level1.txt
View File

@ -3,3 +3,4 @@
GameEntityTypeShip 1 0 0 0 0 90 0 0 0 0 0 GameEntityTypeShip 1 0 0 0 0 90 0 0 0 0 0
GameEntityTypeAsteroid 0 7 0 -3 0 0 0 0.6 0 -0.1 -10 GameEntityTypeAsteroid 0 7 0 -3 0 0 0 0.6 0 -0.1 -10
GameEntityTypeAsteroid 0 -5 0 1 0 0 0 0.3 0 0.4 5 GameEntityTypeAsteroid 0 -5 0 1 0 0 0 0.3 0 0.4 5
GameEntityTypeAsteroid 0 -2 0 3 0 0 3 0.1 0 0.7 5

2
engine/SoundBase.cc
View File

@ -52,7 +52,7 @@ int SoundBase::OnInit(int argc, char* argv[]) {
LogDebug("Sound Init"); LogDebug("Sound Init");
if (Mix_OpenAudio (audio_rate, audio_format, audio_channels, audio_buffers)) { if (Mix_OpenAudio (audio_rate, audio_format, audio_channels, audio_buffers)) {
LogError ("Unable to initialize the sound system!"); LogError ("Unable to initialize the sound system! Error message: %s", SDL_GetError());
} }
Mix_QuerySpec (&audio_rate, &audio_format, &audio_channels); Mix_QuerySpec (&audio_rate, &audio_format, &audio_channels);

2
engine/libraries/oglft/CMakeLists.txt
View File

@ -7,6 +7,8 @@ Set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake )
FIND_PACKAGE( OpenGL REQUIRED ) FIND_PACKAGE( OpenGL REQUIRED )
FIND_PACKAGE( FreeType2 REQUIRED ) FIND_PACKAGE( FreeType2 REQUIRED )
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/liboglft)
IF( ENABLE_QT ) IF( ENABLE_QT )
FIND_PACKAGE( QT REQUIRED ) FIND_PACKAGE( QT REQUIRED )
IF( DESIRED_QT_VERSION EQUAL 3 ) IF( DESIRED_QT_VERSION EQUAL 3 )

2321
engine/libraries/oglft/liboglft/OGLFT.h Normal file
View File

File diff suppressed because it is too large Load Diff