diff -Nru sdl-ball-0.14/background.cpp sdl-ball-1.01/background.cpp --- sdl-ball-0.14/background.cpp 2008-10-17 01:33:02.000000000 +0100 +++ sdl-ball-1.01/background.cpp 2009-01-08 08:59:20.000000000 +0000 @@ -34,6 +34,7 @@ void init(textureManager & texMgr) { + bool l; //Så vi ikke kommer til at slette texture 0 første gang funktionen bliver kaldt if(!firstTexture) glDeleteTextures(1, &tex.prop.texture); @@ -41,58 +42,63 @@ float t = 0.25 * ((float)player.level+1); if(t <= 1.0) - texMgr.load(useTheme("/gfx/bg/1.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/1.jpg",setting.gfxTheme), tex); else if(t <= 2.0) - texMgr.load(useTheme("/gfx/bg/2.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/2.jpg",setting.gfxTheme), tex); else if(t <= 3.0) - texMgr.load(useTheme("/gfx/bg/3.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/3.jpg",setting.gfxTheme), tex); else if(t <= 4.0) - texMgr.load(useTheme("/gfx/bg/4.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/4.jpg",setting.gfxTheme), tex); else if(t <= 5.0) - texMgr.load(useTheme("/gfx/bg/5.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/5.jpg",setting.gfxTheme), tex); else if(t <= 6.0) - texMgr.load(useTheme("/gfx/bg/6.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/6.jpg",setting.gfxTheme), tex); else if(t <= 7.0) - texMgr.load(useTheme("/gfx/bg/7.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/7.jpg",setting.gfxTheme), tex); else if(t <= 8.0) - texMgr.load(useTheme("/gfx/bg/8.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/8.jpg",setting.gfxTheme), tex); else if(t <= 9.0) - texMgr.load(useTheme("/gfx/bg/9.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/9.jpg",setting.gfxTheme), tex); else if(t <= 10.0) - texMgr.load(useTheme("/gfx/bg/10.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/10.jpg",setting.gfxTheme), tex); else if(t <= 11.0) - texMgr.load(useTheme("/gfx/bg/11.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/11.jpg",setting.gfxTheme), tex); else if(t <= 12.0) - texMgr.load(useTheme("/gfx/bg/12.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/12.jpg",setting.gfxTheme), tex); else if(t <= 13.0) - texMgr.load(useTheme("/gfx/bg/13.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/13.jpg",setting.gfxTheme), tex); else if(t <= 14.0) - texMgr.load(useTheme("/gfx/bg/14.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/14.jpg",setting.gfxTheme), tex); else if(t <= 15.0) - texMgr.load(useTheme("/gfx/bg/15.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/15.jpg",setting.gfxTheme), tex); else if(t <= 16.0) - texMgr.load(useTheme("/gfx/bg/16.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/16.jpg",setting.gfxTheme), tex); else if(t <= 17.0) - texMgr.load(useTheme("/gfx/bg/17.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/17.jpg",setting.gfxTheme), tex); else if(t <= 18.0) - texMgr.load(useTheme("/gfx/bg/18.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/18.jpg",setting.gfxTheme), tex); else if(t <= 19.0) - texMgr.load(useTheme("/gfx/bg/19.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/19.jpg",setting.gfxTheme), tex); else if(t <= 20.0) - texMgr.load(useTheme("/gfx/bg/20.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/20.jpg",setting.gfxTheme), tex); else if(t <= 21.0) - texMgr.load(useTheme("/gfx/bg/21.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/21.jpg",setting.gfxTheme), tex); else if(t <= 22.0) - texMgr.load(useTheme("/gfx/bg/22.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/22.jpg",setting.gfxTheme), tex); else if(t <= 23.0) - texMgr.load(useTheme("/gfx/bg/23.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/23.jpg",setting.gfxTheme), tex); else if(t <= 24.0) - texMgr.load(useTheme("/gfx/bg/24.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/24.jpg",setting.gfxTheme), tex); else if(t <= 25.0) - texMgr.load(useTheme("/gfx/bg/25.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/25.jpg",setting.gfxTheme), tex); else - texMgr.load(useTheme("/gfx/bg/final.jpg",setting.gfxTheme), tex); + l=texMgr.load(useTheme("/gfx/bg/final.jpg",setting.gfxTheme), tex); + if(!l) + { + setting.showBg=0; + cout << "Backgrounds disabled." << endl; + } firstTexture=0; diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/changelog.txt /tmp/6MilI4j64K/sdl-ball-1.01/changelog.txt --- sdl-ball-0.14/changelog.txt 2008-11-19 19:52:02.000000000 +0000 +++ sdl-ball-1.01/changelog.txt 2009-01-11 16:07:29.000000000 +0000 @@ -216,5 +216,24 @@ Pressing a savegame slot when saving will write help, so the user know what to do. Savegame box always shown, greyed out. +0.15 aka 1.0: +More levels. (50 Levels in total) +Added dio-sound-theme as an optional sound-theme, try it out and give feedback on the sf.net forum +Balls now stop completely when the game is paused. +Added Window manager Icon to the program when it's running. +Added http address to the intro screen. +Disable background if it is not loaded correctly (not found/too large for gfx hw). +Uses $XDG_CONFIG_HOME enviroment variable over $HOME if found. +Updated Makefile accordingly to advice from Christian "idl0r" Ruppert. +Removed "> inc" option from levels.txt +Removed "> up", "> left" and "> right" from levels.txt + +1.01: +Added some code to try and handle segfault on resolution change (that might be caused by sdl reporting a void current resolution). +If resolution change fail, the game will quit, and not write the wrong resolution to config. + +Planned features: +Some gui way of selecting individual parts of themes. + Stuff that needs doing some time: Get more liniar increase in difficulty by sorting/adding/removing levels. diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/debian/changelog /tmp/6MilI4j64K/sdl-ball-1.01/debian/changelog --- sdl-ball-0.14/debian/changelog 2009-04-29 16:37:18.000000000 +0100 +++ sdl-ball-1.01/debian/changelog 2009-04-29 16:37:18.000000000 +0100 @@ -1,3 +1,14 @@ +sdl-ball (1.01-1) unstable; urgency=low + + * New upstream release. + * debian/copyright: + + Fix the link to upstream source, this is sdl-ball, not sdl-jump. + Closes: #509621. + + Add copyright information for the dio-theme. + + Update copyright years. + + -- Evgeni Golov Thu, 22 Jan 2009 19:00:10 +0100 + sdl-ball (0.14-1) unstable; urgency=low * New upstream release. diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/debian/copyright /tmp/6MilI4j64K/sdl-ball-1.01/debian/copyright --- sdl-ball-0.14/debian/copyright 2009-04-29 16:37:18.000000000 +0100 +++ sdl-ball-1.01/debian/copyright 2009-04-29 16:37:18.000000000 +0100 @@ -2,14 +2,14 @@ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=238 Upstream-Name: SDL-Ball Upstream-Maintainer: Jimmy Christensen -Upstream-Source: http://sourceforge.net/projects/sdl-jump/ +Upstream-Source: http://sourceforge.net/projects/sdl-ball/ Files: * -Copyright: © 2008 Jimmy Christensen +Copyright: © 2008-2009 Jimmy Christensen License: GPL-3+ Files: debian/* -Copyright: © 2008 Evgeni Golov +Copyright: © 2008-2009 Evgeni Golov License: GPL-3+ Files: themes/default/font/Bandal.ttf @@ -20,6 +20,10 @@ Copyright: © 2007 Stephen Branley License: GPL-2 +Files: themes/dio-sound-theme/* +Copyright: © 2008-2009 dionos +License: GPL-3 + License: GPL-3+ On Debian systems, the full text of the GNU General Public License can be found in the `/usr/share/common-licenses/GPL' file. diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/loadlevel.cpp /tmp/6MilI4j64K/sdl-ball-1.01/loadlevel.cpp --- sdl-ball-0.14/loadlevel.cpp 2008-11-03 16:19:36.000000000 +0000 +++ sdl-ball-1.01/loadlevel.cpp 2008-12-14 04:24:47.000000000 +0000 @@ -144,12 +144,9 @@ } string line; int levelread=0,brick=0,ch=0; - bool useCustomDifficulty=0; //If this is still 0 when level is loaded, set difficulty = static_difficulty var.numlevels=0; - var.scrollInfo.direction[0] = 0; - var.scrollInfo.direction[1] = 0; - var.scrollInfo.direction[2] = 0; - var.scrollInfo.direction[3] = 0; + var.scrollInfo.drop = 0; + while(!levelfile.eof()) { @@ -176,26 +173,10 @@ { if(line[0] == '>') { - if(line.substr(0,7) == "> right") - { - var.scrollInfo.speed[0] = atol( line.substr(8,line.length()).data() ); - var.scrollInfo.direction[0] = 1; - } else if(line.substr(0,6) == "> left") - { - var.scrollInfo.speed[1] = atol( line.substr(7,line.length()).data() ); - var.scrollInfo.direction[1] = 1; - } else if(line.substr(0,4) == "> up") + if(line.substr(0,6) == "> down") { - var.scrollInfo.speed[2] = atol( line.substr(5,line.length()).data() ); - var.scrollInfo.direction[2] = 1; - } else if(line.substr(0,6) == "> down") - { - var.scrollInfo.speed[3] = atol( line.substr(7,line.length()).data() ); - var.scrollInfo.direction[3] = 1; - } else if(line.substr(0,5) =="> inc") - { - useCustomDifficulty=1; - difficulty.hitbrickinc[NORMAL] = atof( line.substr(6, line.length()).data() ); + var.scrollInfo.dropspeed = atol( line.substr(7,line.length()).data() ); + var.scrollInfo.drop = 1; } } else { while(line[ch] != 0) @@ -235,9 +216,6 @@ } cout << "Read " << var.numlevels << " levels from '"<< file <<"'" << endl; levelfile.close(); - - if(!useCustomDifficulty) - difficulty = static_difficulty; } void initlevels(brick bricks[], textureClass texLvl[]) diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/main.cpp /tmp/6MilI4j64K/sdl-ball-1.01/main.cpp --- sdl-ball-0.14/main.cpp 2008-11-19 19:53:07.000000000 +0000 +++ sdl-ball-1.01/main.cpp 2009-01-11 16:09:56.000000000 +0000 @@ -60,7 +60,7 @@ #include #endif -#define VERSION "0.14" +#define VERSION "1.01" #define SAVEGAMEVERSION 2 @@ -139,7 +139,7 @@ using namespace std; void writeSettings(); -void initScreen(); +bool initScreen(); void initNewGame(); void pauseGame(); void resumeGame(); @@ -196,9 +196,9 @@ }; struct scrollInfoScruct { - bool direction[4]; //0 right, 1 left, 2 up, 3 down - unsigned int speed[4]; //right, left, up, down, in ms/ticks. - unsigned int lastTick[4]; // what was the time last they moved + bool drop; //0 right, 1 left, 2 up, 3 down + unsigned int dropspeed; + unsigned int lastTick; // what was the time last they moved }; struct privFileStruct { @@ -358,14 +358,7 @@ string themeDir; string temp; vector v; -// //Start with the default theme. -// ti.name="default"; -// ti.gfx=1; -// ti.snd=1; -// ti.lvl=1; -// ti.valid=1; -// v.push_back(ti); - + for(int i=0; i < 2; i++) { if(i==0) @@ -570,7 +563,7 @@ if(temp == NULL) { - cout << "Texture manager ERROR: " << file << " : "<< SDL_GetError() << endl; + cout << "Texture manager: " << file << " : "<< SDL_GetError() << endl; SDL_FreeSurface( temp ); return(FALSE); } @@ -580,9 +573,9 @@ //Hvis større end tilladt: if(temp->w > maxTexSize) { - cout << "Texture manager ERROR: '" << file << "' texturesize too large." << endl; - //TODO: - //Resize surface. + cout << "Texture manager: '" << file << "' texturesize too large." << endl; + SDL_FreeSurface( temp ); + return(FALSE); } @@ -2841,25 +2834,34 @@ return (rand()/(float(RAND_MAX)+1)*total)-negative; } -void initScreen() +bool initScreen() { + bool success=1; int SDL_videomodeSettings = SDL_OPENGL|SDL_RESIZABLE; if(setting.fullscreen) SDL_videomodeSettings |= SDL_FULLSCREEN; + /* Free the previously allocated surface */ + if(screen != NULL) + { + SDL_FreeSurface( screen ); + } + screen = SDL_SetVideoMode(setting.resx,setting.resy,32, SDL_videomodeSettings); resizeWindow(setting.resx,setting.resy); if( screen == NULL ) { cout << "Error:" << SDL_GetError() << endl; + success=0; + var.quit=1; } SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); var.halfresx = setting.resx /2; var.halfresy = setting.resy / 2; - + return(success); } void resetPlayerPowerups() @@ -3582,77 +3584,23 @@ } } -void moveBoard(brick bricks[], int dir) +void dropBoard(brick bricks[]) { - int i; - - switch(dir) + for(int i=0; i < 598; i++) { - case 0: //Move to the right - for(i=0; i < 598; i++) - { - if(bricks[i].active) - { - bricks[i].posx += bricks[i].width*2; - if(bricks[i].posx > 1.60) - { - bricks[i].posx=-1.6+bricks[i].width; - } - } - } - break; - - case 1: // move to the left - for(i=0; i < 598; i++) - { - if(bricks[i].active) - { - bricks[i].posx -= bricks[i].width*2; - if(bricks[i].posx < -1.60) - { - bricks[i].posx= 1.6-bricks[i].width; - } - } - } - break; - - case 2: // move up - for(i=0; i < 598; i++) - { - if(bricks[i].active) - { - bricks[i].posy += bricks[i].height*2; - if(bricks[i].posy > 1.15-bricks[i].height) - { - //Destroy brick, and subtract score - bricks[i].active=0; - updated_nbrick[bricks[i].row][bricks[i].bricknum]=-1; - var.bricksHit=1; - player.score -= bricks[i].score; - gVar.deadTime=0; - } - } - } - break; - - case 3: // move down - for(i=0; i < 598; i++) + if(bricks[i].active) { - if(bricks[i].active) + bricks[i].posy -= bricks[i].height*2; + if(bricks[i].posy < -1.00-bricks[i].height) { - bricks[i].posy -= bricks[i].height*2; - if(bricks[i].posy < -1.00-bricks[i].height) - { - //Destroy brick, and subtract score - bricks[i].active=0; - updated_nbrick[bricks[i].row][bricks[i].bricknum]=-1; - var.bricksHit=1; - player.score -= bricks[i].score; - gVar.deadTime=0; - } + //Destroy brick, and subtract score + bricks[i].active=0; + updated_nbrick[bricks[i].row][bricks[i].bricknum]=-1; + var.bricksHit=1; + player.score -= bricks[i].score; + gVar.deadTime=0; } } - break; } } @@ -3815,11 +3763,16 @@ cout << "SDL-Ball v "VERSION << endl; - -#ifdef WIN32 - privFile.programRoot = ""; // default to ./ on win32 -#else - privFile.programRoot = getenv("HOME"); + // default to "" (If this have a 0 len after trying to getenv, it defaults to ./) + privFile.programRoot = ""; +#ifndef WIN32 + if(getenv("XDG_CONFIG_HOME") != NULL) + { + privFile.programRoot = getenv("XDG_CONFIG_HOME"); + } else if(getenv("HOME") != NULL) { + privFile.programRoot = getenv("HOME"); + privFile.programRoot.append("/.config"); + } #endif //Default places if it can't place files another place. @@ -3832,7 +3785,6 @@ { cout << "Could not locate home directory defaulting to ./" << endl; } else { - privFile.programRoot.append("/.config"); if( checkDir(privFile.programRoot)) { @@ -3988,6 +3940,23 @@ int oldResX = SDL_GetVideoInfo()->current_w; int oldResY = SDL_GetVideoInfo()->current_h; int oldColorDepth = SDL_GetVideoInfo()->vfmt->BitsPerPixel; + + /* Handle those situations where sdl gets a void resolution */ + if(oldResX < 128 || oldResY < 96) + { + cout << "SDL Reported a screen resolution below 128x96."<< endl; + cout << "Assuming this is a bug in SDL or driver." << endl; + cout << "Falling back on 128x96"; + oldResX=128; + oldResY=96; + if(!setting.cfgRes[0] || !setting.cfgRes[1]) + { + setting.fullscreen=0; + cout << ", windowed mode."; + } + cout << endl; + } + /* The above code is not tested and might not work */ if(!setting.cfgRes[0] || !setting.cfgRes[1]) { @@ -4011,7 +3980,8 @@ soundMan.init(); - SDL_WM_SetCaption("SDL-Ball", "SDL-Ball"); + SDL_WM_SetCaption("SDL-Ball", "SDL-Ball" ); + SDL_WM_SetIcon( IMG_Load( useTheme("icon32.png", setting.gfxTheme).data() ), 0 ); SDL_WarpMouse(var.halfresx, var.halfresy); textureManager texMgr; @@ -4154,11 +4124,13 @@ nonpausingGlobalMilliTicks = nonpausingGlobalTicks/1000.0; nonpausingLastTick = SDL_GetTicks(); - if(var.paused) - lastTick = SDL_GetTicks(); - - globalTicks = SDL_GetTicks() - lastTick; - globalMilliTicks = globalTicks/1000.0; + if(!var.paused) + { + globalTicks = SDL_GetTicks() - lastTick; + globalMilliTicks = globalTicks/1000.0; + } else { + globalTicks = globalMilliTicks = 0; + } lastTick = SDL_GetTicks(); globalTicksSinceLastDraw += nonpausingGlobalTicks; @@ -4339,17 +4311,16 @@ //borders glCallList(sceneDL); - for(i=0; i < 4; i++) + + if(var.scrollInfo.drop) { - if(var.scrollInfo.direction[i]) + if( (SDL_GetTicks() - var.scrollInfo.lastTick ) > var.scrollInfo.dropspeed ) { - if( (SDL_GetTicks() - var.scrollInfo.lastTick[i] ) > var.scrollInfo.speed[i] ) - { - var.scrollInfo.lastTick[i]=SDL_GetTicks(); - moveBoard(bricks, i); - } + var.scrollInfo.lastTick=SDL_GetTicks(); + dropBoard(bricks); } } + if(gVar.bricksleft==1) { @@ -4400,7 +4371,7 @@ { if(player.powerup[PO_DROP]) { - moveBoard(bricks, 3); + dropBoard(bricks); } } Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/main.o and /tmp/6MilI4j64K/sdl-ball-1.01/main.o differ diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/Makefile /tmp/6MilI4j64K/sdl-ball-1.01/Makefile --- sdl-ball-0.14/Makefile 2008-11-19 19:52:22.000000000 +0000 +++ sdl-ball-1.01/Makefile 2008-12-31 00:42:35.000000000 +0000 @@ -8,7 +8,7 @@ #append -lwiiuse to compile with WIIUSE support #remove -lSDL_mixer if compiling with -DNOSOUND -LDFLAGS+=-lGL -lGLU `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer +LIBS+=-lGL -lGLU `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer SOURCES=main.cpp OBJECTS=$(SOURCES:.cpp=.o) @@ -18,7 +18,7 @@ all: $(SOURCES) $(EXECUTABLE) $(EXECUTABLE): $(OBJECTS) - $(CC) $(OBJECTS) $(LDFLAGS) -o $@ + $(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ .cpp.o: $(CC) $(CFLAGS) $< -o $@ @@ -28,3 +28,4 @@ remove: rm -R ~/.config/sdl-ball + diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/menu.cpp /tmp/6MilI4j64K/sdl-ball-1.01/menu.cpp --- sdl-ball-0.14/menu.cpp 2008-11-19 19:50:03.000000000 +0000 +++ sdl-ball-1.01/menu.cpp 2009-01-11 16:07:54.000000000 +0000 @@ -622,17 +622,17 @@ setting.resx = 1024; setting.resy = 768; #ifndef WIN32 - initScreen(); + if(initScreen()) #endif - writeSettings(); + writeSettings(); break; case 4: setting.resx = 1600; setting.resy = 1200; #ifndef WIN32 - initScreen(); + if(initScreen()) #endif - writeSettings(); + writeSettings(); break; case 5: if(setting.eyeCandy) @@ -647,9 +647,9 @@ else setting.fullscreen=1; #ifndef WIN32 - initScreen(); + if(initScreen()) #endif - writeSettings(); + writeSettings(); break; } var.menuPressed=0; diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/README /tmp/6MilI4j64K/sdl-ball-1.01/README --- sdl-ball-0.14/README 2008-11-15 14:53:01.000000000 +0000 +++ sdl-ball-1.01/README 2008-12-08 21:16:59.000000000 +0000 @@ -249,10 +249,11 @@ ------------------------------------ 4.0 Contributors and Credits -These are the people who have directly helped the SDL-Ball project: +People who have directly helped the SDL-Ball project, chronologically: Quinton "quin" Reeves - Windows Port. Ciddk - Website and Bugreports -Evgeni Golov - Helped debug strange bug in the highsore display. +Evgeni Golov - Suggestions, comments, insight. +"Dionos" - The dio-sound-theme. ------------------------------------ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/savegames.sav and /tmp/6MilI4j64K/sdl-ball-1.01/savegames.sav differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/sdl-ball.x86.bin and /tmp/6MilI4j64K/sdl-ball-1.01/sdl-ball.x86.bin differ diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/default/levels.txt /tmp/6MilI4j64K/sdl-ball-1.01/themes/default/levels.txt --- sdl-ball-0.14/themes/default/levels.txt 2008-11-11 09:19:24.000000000 +0000 +++ sdl-ball-1.01/themes/default/levels.txt 2009-01-08 08:29:34.000000000 +0000 @@ -64,18 +64,10 @@ N = random powerup 1% Q = random evil powerup 100% -To control how much the ball-speed increases when -hitting a brick in this level, use the > inc FLOAT command -> inc 0.003 -will make the ball-speed increase by 0.003 glunits pr brick it hits, this is the standard for normal difficulty. -This value is ignored by "easy" difficulty - -To create scrolling and/or dropping levels, use these commands. -The commands can be inserted ONE COMMAND PR LINE everywhere between ** Start ** and ** Stop ** +To create dropping levels, use this command, place it on it's own line on a new line after ** Start ** > down 10000 The above makes the bricks drop down once every 10 seconds. - Level 1 ** Start ** 0000000000000000000000000000000000000000000000000000 @@ -156,6 +148,32 @@ ** Stop ** ** Start ** +0000000000L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L30000000000 +00000000L3000000000000L30000L3000000000000L300000000 +000000L30000000000000000L3L30000000000000000L3000000 +0000L30000000000000000L30000L30000000000000000L30000 +L3L30000000000000000L300L3L300L30000000000000000L3L3 +L3L3L3L3L3L3L3L3L3L300L30000L300L3L3L3L3L3L3L3L3L3L3 +0000000000000000L3L3000000000000L3L30000000000000000 +000000000000000000L3L3L3L3L3L3L3L3L30000000000000000 +000000000000000000L3LBLBL8L8LBLBL3000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000L40000L40000000000000000000000 +0000000000000000000000L40000L40000000000000000000000 +L8L8L8L8L8L8L8L8L8L8L8L40000L4L8L8L8L8L8L8L8L8L8L8L8 +LBL4LBL4LBL4LBL4LBL4LBL40000L4L4LBL4LBL4LBL4LBL4LBL4 +L4LBL4LBL4LBL4LBL4LBL4L40000L4LBL4LBL4LBL4LBL4LBL4LB +L5L1L5L1L5L1L5L1L5L1L5L40000L4L1L5L1L5L1L5L1L5L1L5L1 +L1L5L1L5L1L5L1L5L1L5L1L40000L4L5L1L5L1L5L1L5L1L5L1L5 +LBLBLBLBLBLBLBLBLBLBLBL90000L9LBLBLBLBLBLBLBLBLBLBLB +L9L9L9L9L9L9L9L9L9L9L9L90000L9L9L9L9L9L9L9L9L9L9L9L9 +** Stop ** + +** Start ** L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3L3 L5L50000000000L5L500L5L500000000000000L50000L500L5L5 0000L5L5000000L500L5L500L50000L500L5L5L500000000L500 @@ -259,7 +277,6 @@ M2M2M2M2M2M2M2M2M2M2M2M4M3M3M4M2M2M2M2M2M2M2M2M2M2M2 ** Stop ** -//Level 6 ** Start ** MBMBM5M5M5M5M5M5M5M5M5M5MBMBMBMBMBM5M5M5M5M5M5M5M5M5 M5M5M50000000000000000M5M5M5M5M5M5M5000000M5000000M5 @@ -313,6 +330,32 @@ ** Stop ** ** Start ** +M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3 +M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3M3 +0000000000000000000000000000000000000000000000000000 +00000000M2000000000000000000000000000000000000000000 +000000M200M200000000M2M2000000000000000000M200000000 +000000M200M200000000M2M20000000000000000M200M2000000 +00000000M2000000000000000000000000000000M20000M20000 +0000000000000000000000000000M2M20000000000M2M2000000 +00000000000000000000000000M20000M2000000000000000000 +0000000000000000000000000000M200M2000000000000000000 +000000000000000000000000000000M200000000000000000000 +0000000000M2M200000000000000000000000000000000000000 +00000000M20000M2000000000000000000000000000000000000 +00000000M20000M2000000000000000000000000M20000000000 +0000000000M2M20000000000000000M2M2M20000M20000000000 +0000000000000000000000000000000000000000M20000000000 +0000000000000000000000000000000000000000000000000000 +00000000000000000000M2M20000000000000000000000000000 +000000000000000000M20000M200000000000000000000000000 +0000M2000000000000M20000M200000000000000000000000000 +00M200M2000000000000M2M2000000000000M200000000000000 +00M2M20000000000000000000000000000M200M2000000000000 +000000000000000000000000000000000000M200000000000000 +** Stop ** + +** Start ** 000000MB00000000000000M6M6M6M60000000000000000000000 0000MBMBMB0000000000M6M6M6M6M6M600000000000000MB0000 000000MB0000000000M6M6M6M6M6M6M6M60000000000MBMBMB00 @@ -341,6 +384,58 @@ ** Start ** 0000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000M10000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000M100M1000000000000000000000000 +000000000000000000000000MA00000000000000000000000000 +0000000000000000000000M100M100M100000000000000000000 +000000000000000000000000MA00MA0000000000000000000000 +000000000000000000M700M700M700M700000000000000000000 +00000000000000000000MA00MA00MA0000000000000000000000 +000000000000000000M100M100M100M100000000000000000000 +00000000000000000000MA00MA00MA0000000000000000000000 +000000000000000000M100M100M100M100000000000000000000 +** Stop ** + +** Start ** +000000000000000000000000N6N8000000000000000000000000 +000000000000000000000000N6N8000000000000000000000000 +000000000000000000000000N6N8000000000000000000000000 +0000000000000000000000N4N6N8N40000000000000000000000 +00000000000000000000N4NBN6N8NBN400000000000000000000 +000000000000000000N4NBN1N6N8N5NBN4000000000000000000 +0000000000000000N4NBN1NBN6N8NBN5NBN40000000000000000 +00000000000000N4NBN1NBN1N6N8N5NBN5NBN400000000000000 +000000000000N4NBN1NBN1N1N6N8N5N5NBN5NBN4000000000000 +0000000000N4NBN1NBN1N1N1N6N8N5N5N5NBN5NBN40000000000 +000000N4N4NBN1NBN1N1N1N1N6N8N5N5N5N5NBN5NBN4N4000000 +000000N6N6N6N6N6N6N6N6N6N6N8N8N8N8N8N8N8N8N8N8000000 +000000N8N8N8N8N8N8N8N8N8N8N6N6N6N6N6N6N6N6N6N6000000 +000000N4N4N4N4MB07MB07MBN6N8MB07MB07MBN4N4N4N4000000 +00000000000000N4MB07MB07N6N807MB07MBN400000000000000 +0000000000000000N4MB07MBN6N8MB07MBN40000000000000000 +000000000000000000N4MB07N6N807MBN4000000000000000000 +00000000000000000000N4MBN6N8MBN400000000000000000000 +0000000000000000000000N4N6N8N40000000000000000000000 +000000000000000000000000N6N8000000000000000000000000 +000000000000000000000000N6N8000000000000000000000000 +000000000000000000000000N6N8000000000000000000000000 +000000000000000000000000N6N8000000000000000000000000 +** Stop ** + +** Start ** +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 000000000000000000000000L9L9L90000000000000000000000 00000000000000000003030303LB030303030000000000000000 00000000000000000003LCL7L7LBL7L7LC030000000000000000 @@ -391,6 +486,32 @@ ** Stop ** ** Start ** +0000000000000000000000000000000000000000000000000000 +00M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M100 +000000000000000000000000000000000000000000000000L100 +00M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M100 +00L1000000000000000000000000000000000000000000000000 +00M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M100 +000000000000000000000000000000000000000000000000L100 +00M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M100 +00L1000000000000000000000000000000000000000000000000 +00M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M100 +000000000000000000000000000000000000000000000000L100 +00M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1L100 +00L1000000000000000000000000000000000000000000000000 +00M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M100 +000000000000000000000000000000000000000000000000L100 +00M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M100 +00L1000000000000000000000000000000000000000000000000 +00M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1L100 +000000000000000000000000000000000000000000000000L100 +00L1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M100 +00L1000000000000000000000000000000000000000000000000 +00M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M1M100 +0000000000000000000000000000000000000000000000000000 +** Stop ** + +** Start ** 00000000000000000000000000000000MD14A600MD14A6000000000000000000 000000000000000000000000000000MD14A6000000MD14A60000000000000000 00000000000000000000000000MDB30000MDB30000MDB30000MDB300000000MD14A600000000000000 @@ -577,6 +698,32 @@ 0000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +00000000M500M5M5M5M5M5M5M5M5M5M5M5M5M5M500M500000000 +000000M5MAM5M4M4M4M4M4M4M4M4M4M4M4M4M4M4M5MAM5000000 +0000M5M1MA00M5M4MBMBMBMBMBMBMBMBMBMBM4M500MAM1M50000 +00M500M5MAM1MAM5M4M4M4M4M4M4M4M4M4M4M5MAM1MAM500M500 +M3000000M500MA00M5M4MBMBMBMBMBMBM4M500MA00M5000000M3 +0000000000M5MAM1MAM5M4M4M4M4M4M4M5MAM1MAM50000000000 +000000000000M500MA00M5M4MBMBM4M500MA00M5000000000000 +00000000000000M5MAM1MAM5M4M4M5MAM1MAM500000000000000 +0000000000000000M500MA00M5M500MA00M50000000000000000 +000000000000000000M5MAM1MAMAM1MAM5000000000000000000 +00000000000000000000M500MAMA00M500000000000000000000 +0000000000000000000000M5MAMAM50000000000000000000000 +000000000000000000000000M5M5000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +** Stop ** + +** Start ** +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 00000000000004040404040000L4L4L4L4L40000000000000000 0000000000040A0A0A0A040000L4L8L8L8L8L400000000000000 00000000040A0A0A0A0A040000L4L8L8L8L8L8L4000000000000 @@ -599,9 +746,7 @@ 0504040504040504040504040504040504040504040504040504 ** Stop ** - ** Start ** -> inc 0.04 MB0000000000MB00000000000000MB000000MB00000000000000 00MB000000MB00MB0000000000MB00MB00MB00MB000000000000 0000MB00MB000000MB000000MB000000MB000000MB0000000000 @@ -785,6 +930,32 @@ ** Stop ** ** Start ** +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000M6M6M6000000000000000000000000 +0000000000000000000000MBMBMB000000000000000000000000 +0000000000000000000000M6M6M6000000000000000000000000 +00000000000000M6M600000000000000M6M60000000000000000 +0000000000000000MB00000000000000MB000000000000000000 +00000000000000M6M600000000000000M6M60000000000000000 +00000000000000000000M1M1M1M1M10000000000000000000000 +00000000000000000000M1M5M5M5M10000000000000000000000 +00000000000000000000M1M5MAMAMA0000000000000000000000 +00000000000000000000MAMAMAM5M10000000000000000000000 +00000000000000000000M1M5M5M5M10000000000000000000000 +00000000000000000000M1M1M1M1M10000000000000000000000 +0000000000000000000000000000000000000000000000000000 +00000000000000M3M3M4M4M4M4M4M4M4M3M30000000000000000 +00000000000000000000M4MBMBMBM40000000000000000000000 +00000000000000000000M4MBMCMBM40000000000000000000000 +00000000000000000000M4M3M3M3M40000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +** Stop ** + +** Start ** 0000000000000000000303030303030303000000000000000000 000000000000000000030000LBLB000003000000000000000000 0000000000000000000300LBLBLBLB0003000000000000000000 @@ -1151,6 +1322,32 @@ ** Stop ** ** Start ** +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000 +000000000000000000000000MCMC000000000000000000000000 +00000000MAMA0000000000MAMCMCM10000000000M1M100000000 +000000MAMAMAMA000000MAMAMBMBM1M1000000M1M1M1M1000000 +0000MAMA0000MAMA00MAMAMB0000MBM1M1M1M1M10000M1M10000 +00MAMA00M5M500MAMAMAMB00M5M500MBM1M1M100M5M500M1M100 +00MAMA0000M500MAMAMB00M5M5M5M500MBM1M100M50000M1M100 +00MAMA00M50000MAMA000000M5M5000000M1M10000M500M1M100 +00MAMA0000M500MAMA0000M5M5M5M50000M1M100M50000M1M100 +00MAMA00M50000MAMA000000M5M5000000M1M10000M500M1M100 +00MAMA0000M500MAMA0000M5M5M5M50000M1M100M50000M1M100 +00MAMA00M50000MAMA000000M5M5000000M1M10000M500M1M100 +00MAMA0000M500MAMA0000M5M5M5M50000M1M100M50000M1M100 +00MAMA00M50000MAMA000000M5M5000000M1M10000M500M1M100 +00MAMA0000M500MAMA0000M5M5M5M50000M1M100M50000M1M100 +00MAMA00M50000MAMA000000M5M5000000M1M10000M500M1M100 +00MAMA0000M500MAMA0000M5M5M5M50000M1M100M50000M1M100 +00MAMA00M50000MAMA000000M5M5000000M1M10000M500M1M100 +00MAMA0000M500MAMA0000M5M5M5M50000M1M100M50000M1M100 +00MAMA00M50000MAMA000000M5M5000000M1M10000M500M1M100 +00MAMA00M5M500MAM4M4M4M4M4M4M4M4M4M4M100M5M500M1M100 +** Stop ** + +** Start ** 000000K200000000K20000000000000000000000000000000000 0000K2KBK200000000000000000000000000K800000000000000 000000K20000000000000000000000000000K800000000K20000 diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/readme /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/readme --- sdl-ball-0.14/themes/dio-sound-theme/readme 1970-01-01 01:00:00.000000000 +0100 +++ sdl-ball-1.01/themes/dio-sound-theme/readme 2008-12-08 21:25:27.000000000 +0000 @@ -0,0 +1,5 @@ +dio-sound-theme v1.0 for SDL-Ball + +These sounds are free under GPLv3. +Contact: dionos [at] pandora.be + Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/ball-hit-border.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/ball-hit-border.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/ball-hit-paddle.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/ball-hit-paddle.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/buy-powerup.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/buy-powerup.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/cement-brick-hit.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/cement-brick-hit.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/die.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/die.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/doom-brick-break.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/doom-brick-break.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/evil-po-hit-paddle.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/evil-po-hit-paddle.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/expl-brick-break.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/expl-brick-break.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/gameover.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/gameover.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/glass-brick-break.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/glass-brick-break.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/glass-brick-hit.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/glass-brick-hit.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/glue-ball-hit-paddle.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/glue-ball-hit-paddle.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/good-po-hit-paddle.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/good-po-hit-paddle.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/highscore.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/highscore.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/invisible-brick-appear.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/invisible-brick-appear.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/menuclick.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/menuclick.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/nextlevel.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/nextlevel.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/norm-brick-breaka.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/norm-brick-breaka.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/norm-brick-breakb.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/norm-brick-breakb.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/norm-brick-breakc.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/norm-brick-breakc.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/norm-brick-breakd.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/norm-brick-breakd.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/norm-brick-breake.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/norm-brick-breake.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/po-hit-border.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/po-hit-border.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/shot.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/shot.ogg differ Binary files /tmp/R6UzLM4IzL/sdl-ball-0.14/themes/dio-sound-theme/snd/start.ogg and /tmp/6MilI4j64K/sdl-ball-1.01/themes/dio-sound-theme/snd/start.ogg differ diff -Nru /tmp/R6UzLM4IzL/sdl-ball-0.14/title.cpp /tmp/6MilI4j64K/sdl-ball-1.01/title.cpp --- sdl-ball-0.14/title.cpp 2008-11-07 22:35:41.000000000 +0000 +++ sdl-ball-1.01/title.cpp 2008-12-31 01:22:38.000000000 +0000 @@ -254,6 +254,10 @@ glTranslatef(0.0,-glText->getHeight(FONT_INTROHIGHSCORE),0.0); } + //Draw the info string with website and version + glColor4f(1,1,0,1); + glText->write("Visit http://sdl-ball.sf.net/ for info, help and updates!", FONT_INTROHIGHSCORE, 1, 1.0, 0,0); + if(!rotDir) { rot += 0.01 * globalTicksSinceLastDraw; @@ -269,11 +273,13 @@ } } glLoadIdentity(); + glTranslatef(0.0,0.0,-3.0); + glRotatef(20, 1,0,0); glRotatef(rot, 0,1,0); glCallList(glTitleList); - + SDL_GL_SwapBuffers( ); globalTicksSinceLastDraw=0;