Mercurial > hg > dmlib
diff src/dmsimple.c @ 1102:e06abfde6c39
Cosmetics pass: Remove excess whitespace.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 03 Mar 2015 23:22:36 +0200 |
parents | 47c0514d9ba4 |
children | 007a9446256c |
line wrap: on
line diff
--- a/src/dmsimple.c Tue Mar 03 22:32:34 2015 +0200 +++ b/src/dmsimple.c Tue Mar 03 23:22:36 2015 +0200 @@ -56,12 +56,12 @@ case 1: dmVerbosity++; break; - + default: dmErrorDBGMsg("Unknown option '%s'.\n", currArg); return FALSE; } - + return TRUE; } @@ -72,10 +72,10 @@ dh = 20, dw = engine.screen->w - (2 * dx), dy = (engine.screen->h - dh) / 2; - + if (SDL_MUSTLOCK(engine.screen) != 0 && SDL_LockSurface(engine.screen) != 0) return DMERR_INIT_FAIL; - + // Draw the progress bar dmClearSurface(engine.screen, dmMapRGBA(engine.screen, 0,0,0,0)); dmFillRect(engine.screen, dx, dy, dx+dw, dy+dh, dmMapRGB(engine.screen, 255,255,255)); @@ -114,7 +114,7 @@ first = FALSE; } while (err == DMERR_PROGRESS); - + return err; } @@ -171,11 +171,11 @@ { DMModeEntry *mode; int i, aspect = engineGetVideoAspect(w, h); - + dmPrint(2, " - Proposed %d x %d\n", w, h); if (aspect <= 0) return DMERR_INVALID_ARGS; - + // Check if the mode is already in our list for (i = 0; i < nengineModeList; i++) { @@ -191,7 +191,7 @@ if (aspect != engine.optVidAspect) return DMERR_OK; break; - + case DM_VSETUP_ANY: break; } @@ -204,16 +204,16 @@ if (engineModeList == NULL) return DMERR_MALLOC; } - + // Store mode = &engineModeList[nengineModeList]; mode->w = w; mode->h = h; mode->aspect = engineGetVideoAspect(w, h); dmPrint(2, " - %d x %d, %d\n", w, h, mode->aspect); - + nengineModeList++; - + return DMERR_OK; } @@ -240,7 +240,7 @@ // Find start of the line for (pos = 0; isspace(buf[pos]); pos++); - + // Skip empty lines and comments if (buf[pos] == 0 || buf[pos] == '#') continue; @@ -310,7 +310,7 @@ "No compatible video resolutions/depths available at all. Bailing out.\n"); goto out; } - + if (modes != (SDL_Rect**) -1) { int i; @@ -386,7 +386,7 @@ result, dmErrorStr(result)); goto out; } - + if (menuBgImage->w != DM_VSETUP_WIDTH || menuBgImage->h != DM_VSETUP_HEIGHT) { @@ -509,7 +509,7 @@ // Render the menu dmDirectBlitSurface(menuBgImage, engine.screen); - + // XXX/TODO: Some hardcoded bits here ... float t = engineGetTimeDT(&engine); int index, entry; @@ -538,7 +538,7 @@ DMFloat posX = engine.setupMenuCenter ? 2.0f + (vsX(engine.setupMenuDim) - menuFont->width * strlen(menuStr)) / 2.0f : 2.0f; - + dmDrawBMTextConst( engine.screen, menuFont, engine.setupTextCondensed, DMD_TRANSPARENT, @@ -546,7 +546,7 @@ vsY(engine.setupMenuPos) + (index * menuEntryHeight), menuStr); } - + dmDrawBMTextConst( engine.screen, menuFont, engine.setupTextCondensed, DMD_TRANSPARENT, @@ -594,7 +594,7 @@ SDL_FreeSurface(menuBgImage); SDL_FreeSurface(menuBarImage); dmFreeBitmapFont(menuFont); - + return menuState; } @@ -682,7 +682,7 @@ engine.optAfmt.format = AUDIO_S16SYS; engine.optAfmt.channels = 2; } - + if (engine.optAfmt.samples == 0) engine.optAfmt.samples = engine.optAfmt.freq / 50; @@ -835,7 +835,7 @@ case SDLK_ESCAPE: engine.exitFlag = TRUE; break; - + case SDLK_SPACE: engine.pauseFlag = !engine.pauseFlag; break; @@ -876,7 +876,7 @@ engine.paused = engine.pauseFlag; engine.pauseTime = engineGetTick(&engine); } - + if (engine.paused) { engine.startTime = engine.frameTime - engine.pauseTime; @@ -946,7 +946,7 @@ } SDL_UnlockAudio(); - + if (engine.audioStreamMutex != NULL) dmDestroyMutex(engine.audioStreamMutex);