← Back to branch summary

~ubuntu-branches/ubuntu/lucid/warzone2100/lucid

« back to all changes in this revision

Viewing changes to src/ingameop.c

  • Committer: Bazaar Package Importer
  • Author(s): Christoph Egger, Paul Wise, Christoph Egger
  • Date: 2009-06-29 17:12:52 UTC
  • mfrom: (1.1.11 upstream) (2.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090629171252-5ddnlfg3zfchrega
Tags: 2.2.1+dfsg1-1
http://bugs.debian.org/534962
https://launchpad.net/bugs/372872
[ Paul Wise ]
* New upstream release (Closes: #534962)
* Adjust the flex build-depends to take account of the conflict
  with all the versions of flex 2.5.34 (LP: #372872)
* Make the -music Recommends more strict, 2.1 music doesn't work
  with 2.2.
* Upstream moved the downloads to sourceforge, update the watch file
* Bump Standards-Version, no changes needed
* Drop use of dh_desktop since it no longer does anything
* Recommend the new warzone2100-video package, version 2.2 or similar
* Mention the warzone2100 crash reports in the -dbg package description

[ Christoph Egger ]
* Replace CC-2.0 graphic from cybersphinx, create a new tarball
* Add myself to uploaders

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ingameop.c
1
1
/*
2
2
        This file is part of Warzone 2100.
3
3
        Copyright (C) 1999-2004  Eidos Interactive
4
 
        Copyright (C) 2005-2007  Warzone Resurrection Project
 
4
        Copyright (C) 2005-2009  Warzone Resurrection Project
5
5
 
6
6
        Warzone 2100 is free software; you can redistribute it and/or modify
7
7
        it under the terms of the GNU General Public License as published by
154
154
        // fx vol
155
155
        addIGTextButton(INTINGAMEOP_FXVOL, INTINGAMEOP_1_Y, _("Voice Volume"), WBUT_PLAIN);
156
156
        addFESlider(INTINGAMEOP_FXVOL_S, INTINGAMEOP, INTINGAMEOP_MID, INTINGAMEOP_1_Y-5,
157
 
                                AUDIO_VOL_MAX, (int)(sound_GetUIVolume() * 100.0), INTINGAMEOP_FXVOL);
 
157
                                AUDIO_VOL_MAX, (int)(sound_GetUIVolume() * 100.0));
158
158
 
159
159
        // fx vol
160
160
        addIGTextButton(INTINGAMEOP_3DFXVOL, INTINGAMEOP_2_Y, _("FX Volume"), WBUT_PLAIN);
161
161
        addFESlider(INTINGAMEOP_3DFXVOL_S, INTINGAMEOP, INTINGAMEOP_MID, INTINGAMEOP_2_Y-5,
162
 
                                AUDIO_VOL_MAX, (int)(sound_GetEffectsVolume() * 100.0), INTINGAMEOP_3DFXVOL);
 
162
                                AUDIO_VOL_MAX, (int)(sound_GetEffectsVolume() * 100.0));
163
163
 
164
164
        // cd vol
165
165
        addIGTextButton(INTINGAMEOP_CDVOL, INTINGAMEOP_3_Y, _("Music Volume"), WBUT_PLAIN);
166
166
        addFESlider(INTINGAMEOP_CDVOL_S, INTINGAMEOP, INTINGAMEOP_MID, INTINGAMEOP_3_Y-5,
167
 
                                AUDIO_VOL_MAX, (int)(sound_GetMusicVolume() * 100), INTINGAMEOP_CDVOL);
168
 
 
169
 
        /*
170
 
        // gamma
171
 
        if (pie_GetRenderEngine() == ENGINE_GLIDE)
172
 
        {
173
 
                addIGTextButton(INTINGAMEOP_GAMMA, INTINGAMEOP_3_Y, _("Gamma"), WBUT_PLAIN);
174
 
 
175
 
                if(gammaValue>3)           gammaValue = (float)2.9;
176
 
                if(gammaValue<0.5)  gammaValue = (float).5;
177
 
 
178
 
                addFESlider(INTINGAMEOP_GAMMA_S,INTINGAMEOP , INTINGAMEOP_MID,INTINGAMEOP_3_Y-5,60,(UDWORD)(gammaValue*25),INTINGAMEOP_GAMMA );
179
 
 
180
 
        }
181
 
*/
 
167
                                AUDIO_VOL_MAX, (int)(sound_GetMusicVolume() * 100));
182
168
 
183
169
        return true;
184
170
}
417
403
        case INTINGAMEOP_FXVOL:
418
404
        case INTINGAMEOP_3DFXVOL:
419
405
        case INTINGAMEOP_CDVOL:
420
 
//      case INTINGAMEOP_GAMMA:
421
406
                break;
422
407
 
423
408
 
431
416
                sound_SetMusicVolume((float)widgGetSliderPos(psWScreen, INTINGAMEOP_CDVOL_S) / 100.0);
432
417
                break;
433
418
 
434
 
//      case INTINGAMEOP_GAMMA_S:
435
 
//              gammaValue = (float)(widgGetSliderPos(psWScreen,INTINGAMEOP_GAMMA_S))/25  ;
436
 
//              if(gammaValue<0.5)  gammaValue = (float).5;
437
 
//              pie_SetGammaValue(gammaValue);
438
 
//              break;
439
 
 
440
 
 
441
419
        default:
442
420
                break;
443
421
        }