Menu
▾
▴
[Timewarp-commit] source/melee mfleet.cpp,1.12,1.13 mfleet.h,1.8,1.9 mmain.cpp,1.15,1.16 moptions.cpp,1.6,1.7
|
From: <geo...@us...> - 2003-11-12 17:35:35
|
Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv23410/melee
Modified Files:
mfleet.cpp mfleet.h mmain.cpp moptions.cpp
Log Message:
carriage return fix ?
Index: mfleet.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mfleet.cpp 11 Nov 2003 07:31:51 -0000 1.12
--- mfleet.cpp 12 Nov 2003 17:35:30 -0000 1.13
***************
*** 44,55 ****
"Coders",
"Origin"
! };
! char * Fleet::fleetCostName[] = {
! "Small",//FLEET_SIZE_SMALL = 100,
! "Medium",//FLEET_SIZE_MEDIUM = 250,
! "Large",//FLEET_SIZE_LARGE = 500,
! "Huge",//FLEET_SIZE_HUGE = 1000,
! "Massive"//FLEET_SIZE_MASSIVE = 10000
};
--- 44,55 ----
"Coders",
"Origin"
! };
! char * Fleet::fleetCostName[] = {
! "Small",//FLEET_SIZE_SMALL = 100,
! "Medium",//FLEET_SIZE_MEDIUM = 250,
! "Large",//FLEET_SIZE_LARGE = 500,
! "Huge",//FLEET_SIZE_HUGE = 1000,
! "Massive"//FLEET_SIZE_MASSIVE = 10000
};
***************
*** 74,78 ****
Fleet::Fleet() {STACKTRACE
! cost = 0;
maxFleetCost = (FleetCost)FLEET_COST_DEFAULT;
memset(title, '\0', MAX_TITLE_LENGTH);
--- 74,78 ----
Fleet::Fleet() {STACKTRACE
! cost = 0;
maxFleetCost = (FleetCost)FLEET_COST_DEFAULT;
memset(title, '\0', MAX_TITLE_LENGTH);
***************
*** 189,193 ****
char slot_str[8];
! sort(ships.begin(), ships.end());
--- 189,193 ----
char slot_str[8];
! sort(ships.begin(), ships.end());
***************
*** 202,206 ****
set_config_int(section, "Size", count);
! set_config_string(section, "Title", title);
set_config_int(section, "MaxFleetCost", getMaxCost());
}
--- 202,206 ----
set_config_int(section, "Size", count);
! set_config_string(section, "Title", title);
set_config_int(section, "MaxFleetCost", getMaxCost());
}
***************
*** 216,221 ****
if (filename) set_config_file(filename);
int _fleet_size = get_config_int(section, "Size", 0);
! _fleet_title = get_config_string(section, "Title", "");
! sprintf(title, _fleet_title);
maxFleetCost = (FleetCost) get_config_int(section, "MaxFleetCost", FLEET_COST_DEFAULT);
--- 216,221 ----
if (filename) set_config_file(filename);
int _fleet_size = get_config_int(section, "Size", 0);
! _fleet_title = get_config_string(section, "Title", "");
! sprintf(title, _fleet_title);
maxFleetCost = (FleetCost) get_config_int(section, "MaxFleetCost", FLEET_COST_DEFAULT);
Index: mfleet.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mfleet.h 11 Nov 2003 07:31:51 -0000 1.8
--- mfleet.h 12 Nov 2003 17:35:30 -0000 1.9
***************
*** 11,15 ****
using namespace std;
!
//TODO get rid of global variables used by this function; remove this function
--- 11,15 ----
using namespace std;
!
//TODO get rid of global variables used by this function; remove this function
***************
*** 25,31 ****
typedef vector<MyFleetShipType> MyFleetListType;
! static char * sortingMethodName[];
static char * fleetCostName[];
!
public:
--- 25,31 ----
typedef vector<MyFleetShipType> MyFleetListType;
! static char * sortingMethodName[];
static char * fleetCostName[];
!
public:
***************
*** 58,134 ****
/**
*/
! static char * getSortingMethodName(SortingMethod method) {
! ASSERT( ! ( (method > MAX_SORTING_METHODS) || (method < 0)) );
!
! if ( (method > MAX_SORTING_METHODS) || (method < 0))
return "";
return sortingMethodName[method];
! }
!
! enum FleetCost {
! FLEET_COST_SMALL = 100,
! FLEET_COST_MEDIUM = 250,
! FLEET_COST_LARGE = 500,
! FLEET_COST_HUGE = 1000,
! FLEET_COST_MASSIVE = 10000
! };
!
! enum { FLEET_COST_DEFAULT = FLEET_COST_LARGE };
! enum { FIRST_FLEET_COST = FLEET_COST_SMALL };
! enum { MAX_FLEET_COSTS = FLEET_COST_MASSIVE };
!
! /** \brief cycles through each of the available preset maximum fleet sizes.
! \return the new fleet size */
! FleetCost cycleMaxFleetCost() {
! ASSERT (!( (size != FLEET_COST_SMALL) &&
! (size != FLEET_COST_MEDIUM) &&
! (size != FLEET_COST_LARGE) &&
! (size != FLEET_COST_HUGE) &&
! (size != FLEET_COST_MASSIVE) ));
!
! switch (maxFleetCost) {
! case FLEET_COST_SMALL:
! maxFleetCost = FLEET_COST_MEDIUM; break;
! case FLEET_COST_MEDIUM:
! maxFleetCost = FLEET_COST_LARGE; break;
! case FLEET_COST_LARGE:
! maxFleetCost = FLEET_COST_HUGE; break;
! case FLEET_COST_HUGE:
! maxFleetCost = FLEET_COST_MASSIVE; break;
! case FLEET_COST_MASSIVE:
! maxFleetCost = FLEET_COST_SMALL; break;
! default:
! ASSERT(0);
! }
! return maxFleetCost;
! }
!
! protected:
! /** \brief the maximum cost this fleet will allow */
! FleetCost maxFleetCost;
!
! public:
!
! static char * getFleetCostName(FleetCost size) {
!
! ASSERT (!( (size != FLEET_COST_SMALL) &&
! (size != FLEET_COST_MEDIUM) &&
! (size != FLEET_COST_LARGE) &&
! (size != FLEET_COST_HUGE) &&
! (size != FLEET_COST_MASSIVE) ));
!
! // this has got to be the worst solution ever :)
! int index = 0;
! switch (size) {
! case FLEET_COST_SMALL: index = 0; break;
! case FLEET_COST_MEDIUM: index = 1; break;
! case FLEET_COST_LARGE: index = 2; break;
! case FLEET_COST_HUGE: index = 3; break;
! case FLEET_COST_MASSIVE: index = 4; break;
! default:
! ASSERT(0);
! }
! return fleetCostName[index];
! }
--- 58,134 ----
/**
*/
! static char * getSortingMethodName(SortingMethod method) {
! ASSERT( ! ( (method > MAX_SORTING_METHODS) || (method < 0)) );
!
! if ( (method > MAX_SORTING_METHODS) || (method < 0))
return "";
return sortingMethodName[method];
! }
!
! enum FleetCost {
! FLEET_COST_SMALL = 100,
! FLEET_COST_MEDIUM = 250,
! FLEET_COST_LARGE = 500,
! FLEET_COST_HUGE = 1000,
! FLEET_COST_MASSIVE = 10000
! };
!
! enum { FLEET_COST_DEFAULT = FLEET_COST_LARGE };
! enum { FIRST_FLEET_COST = FLEET_COST_SMALL };
! enum { MAX_FLEET_COSTS = FLEET_COST_MASSIVE };
!
! /** \brief cycles through each of the available preset maximum fleet sizes.
! \return the new fleet size */
! FleetCost cycleMaxFleetCost() {
! ASSERT (!( (size != FLEET_COST_SMALL) &&
! (size != FLEET_COST_MEDIUM) &&
! (size != FLEET_COST_LARGE) &&
! (size != FLEET_COST_HUGE) &&
! (size != FLEET_COST_MASSIVE) ));
!
! switch (maxFleetCost) {
! case FLEET_COST_SMALL:
! maxFleetCost = FLEET_COST_MEDIUM; break;
! case FLEET_COST_MEDIUM:
! maxFleetCost = FLEET_COST_LARGE; break;
! case FLEET_COST_LARGE:
! maxFleetCost = FLEET_COST_HUGE; break;
! case FLEET_COST_HUGE:
! maxFleetCost = FLEET_COST_MASSIVE; break;
! case FLEET_COST_MASSIVE:
! maxFleetCost = FLEET_COST_SMALL; break;
! default:
! ASSERT(0);
! }
! return maxFleetCost;
! }
!
! protected:
! /** \brief the maximum cost this fleet will allow */
! FleetCost maxFleetCost;
!
! public:
!
! static char * getFleetCostName(FleetCost size) {
!
! ASSERT (!( (size != FLEET_COST_SMALL) &&
! (size != FLEET_COST_MEDIUM) &&
! (size != FLEET_COST_LARGE) &&
! (size != FLEET_COST_HUGE) &&
! (size != FLEET_COST_MASSIVE) ));
!
! // this has got to be the worst solution ever :)
! int index = 0;
! switch (size) {
! case FLEET_COST_SMALL: index = 0; break;
! case FLEET_COST_MEDIUM: index = 1; break;
! case FLEET_COST_LARGE: index = 2; break;
! case FLEET_COST_HUGE: index = 3; break;
! case FLEET_COST_MASSIVE: index = 4; break;
! default:
! ASSERT(0);
! }
! return fleetCostName[index];
! }
***************
*** 229,242 ****
ShipType * operator[](int offset) {
return getShipType( offset );
! }
!
! /** @brief returns the maximum number of ships that this fleet can hold */
! int getMaxNumberOfShips() { return MAX_FLEET_SIZE; }
!
! /** @brief returns the maximum sum of costs of each ship in the fleet */
! FleetCost getMaxCost() { return maxFleetCost; }
!
!
!
--- 229,242 ----
ShipType * operator[](int offset) {
return getShipType( offset );
! }
!
! /** @brief returns the maximum number of ships that this fleet can hold */
! int getMaxNumberOfShips() { return MAX_FLEET_SIZE; }
!
! /** @brief returns the maximum sum of costs of each ship in the fleet */
! FleetCost getMaxCost() { return maxFleetCost; }
!
!
!
***************
*** 252,257 ****
/** \brief the list of ships*/
! MyFleetListType ships;
!
--- 252,257 ----
/** \brief the list of ships*/
! MyFleetListType ships;
!
Index: mmain.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmain.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mmain.cpp 11 Nov 2003 19:52:53 -0000 1.15
--- mmain.cpp 12 Nov 2003 17:35:30 -0000 1.16
***************
*** 494,503 ****
Fleet *fleet = player_fleet[i];
if (fleet->getSize() == 0) continue;
! char buffy[512];
! if (strlen(fleet->getTitle()) != 0)
! sprintf(buffy, "%s\n%s\n", player_name[i], fleet->getTitle());
! else
! sprintf(buffy, "%s\n", player_name[i]);
slot[i] = player_control[i]->choose_ship(window, buffy, fleet);
--- 494,503 ----
Fleet *fleet = player_fleet[i];
if (fleet->getSize() == 0) continue;
! char buffy[512];
! if (strlen(fleet->getTitle()) != 0)
! sprintf(buffy, "%s\n%s\n", player_name[i], fleet->getTitle());
! else
! sprintf(buffy, "%s\n", player_name[i]);
slot[i] = player_control[i]->choose_ship(window, buffy, fleet);
Index: moptions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** moptions.cpp 5 Nov 2003 09:43:37 -0000 1.6
--- moptions.cpp 12 Nov 2003 17:35:30 -0000 1.7
***************
*** 109,144 ****
return;
}
!
!
! bool confirmVideoChanges() {
! enum {
! DIALOG_CONFIRM_VIDEO_BOX = 0,
! DIALOG_CONFIRM_VIDEO_TEXT,
! DIALOG_CONFIRM_VIDEO_YES,
! DIALOG_CONFIRM_VIDEO_NO
! };
!
! DIALOG confirmVideoDialog[] = {
! // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp)
! { d_box_proc, 120, 140, 368, 90, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL },
! { d_text_proc, 130, 150, 348, 30, 255, 0, 0, 0, 0, 0, (void *)"Do you want to keep these settings?", NULL, NULL },
! { d_button_proc, 130, 190, 174, 30, 255, 0, 0,D_EXIT, 0, 0, (void *)"Yes", NULL, NULL },
! { d_button_proc, 294, 190, 174, 30, 255, 0, 0,D_EXIT, 0, 0, (void *)"No", NULL, NULL },
! { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 3, 0, NULL, NULL, NULL }
! };
!
! int choice = -1;
! while (-1 != (choice = tw_popup_dialog(NULL, confirmVideoDialog, 0))) {
! switch (choice) {
! case DIALOG_CONFIRM_VIDEO_YES:
! return true;
! case DIALOG_CONFIRM_VIDEO_NO:
! return false;
! }
! }
! return false;
}
!
! int handleGammaSliderChange(void *dp3, int d2);
char *resolution[] = {
--- 109,144 ----
return;
}
!
!
! bool confirmVideoChanges() {
! enum {
! DIALOG_CONFIRM_VIDEO_BOX = 0,
! DIALOG_CONFIRM_VIDEO_TEXT,
! DIALOG_CONFIRM_VIDEO_YES,
! DIALOG_CONFIRM_VIDEO_NO
! };
!
! DIALOG confirmVideoDialog[] = {
! // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp)
! { d_box_proc, 120, 140, 368, 90, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL },
! { d_text_proc, 130, 150, 348, 30, 255, 0, 0, 0, 0, 0, (void *)"Do you want to keep these settings?", NULL, NULL },
! { d_button_proc, 130, 190, 174, 30, 255, 0, 0,D_EXIT, 0, 0, (void *)"Yes", NULL, NULL },
! { d_button_proc, 294, 190, 174, 30, 255, 0, 0,D_EXIT, 0, 0, (void *)"No", NULL, NULL },
! { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 3, 0, NULL, NULL, NULL }
! };
!
! int choice = -1;
! while (-1 != (choice = tw_popup_dialog(NULL, confirmVideoDialog, 0))) {
! switch (choice) {
! case DIALOG_CONFIRM_VIDEO_YES:
! return true;
! case DIALOG_CONFIRM_VIDEO_NO:
! return false;
! }
! }
! return false;
}
!
! int handleGammaSliderChange(void *dp3, int d2);
char *resolution[] = {
***************
*** 188,233 ****
{ NULL, 0, 0, 0, 0, 255, 0, 0, 0, 3, 0, NULL, NULL, NULL }
};
!
! int handleGammaSliderChange(void *dp3, int d2) {
! set_gamma(d2);
! return d2;
! }
void video_menu (Game *game) {STACKTRACE
! int choice = -1;
! bool done = false;
!
while ( (choice != DIALOG_VIDEO_EXIT) && (!done) ) {
! sprintf(dialog_string[3], "%dx%d", videosystem.width, videosystem.height);
! //set index for resolution
! int x, y, x2, y2, i, bpp, bpp2, fs;
! x2 = videosystem.width;
! y2 = videosystem.height;
! for (i = 0; resolution[i+1]; i += 1) {
! x = strtol(resolution[i], NULL, 10);
! y = strtol(strchr(resolution[i], 'x') + 1, NULL, 10);
! if ((x == x2) && (y == y2)) break;
! }
! video_dialog[DIALOG_VIDEO_RESLIST].d1 = i;
!
! //set index for bpp
! bpp = videosystem.bpp;
! for (i = 0; true; i += 1) {
! if (!color_depth[i]) tw_error("video_menu - current bpp invalid?");
! if (strtol(color_depth[i], NULL, 10) == bpp) break;
! }
! video_dialog[DIALOG_VIDEO_BPPLIST].d1 = i;
!
! //set button for fullscreen
! video_dialog[DIALOG_VIDEO_FULLSCREEN].flags = videosystem.fullscreen ? D_SELECTED : 0;
!
! int startfs = video_dialog[DIALOG_VIDEO_FULLSCREEN].flags;
!
!
! //set gamma correction
! video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2 = get_gamma();
//do the dialog
--- 188,233 ----
{ NULL, 0, 0, 0, 0, 255, 0, 0, 0, 3, 0, NULL, NULL, NULL }
};
!
! int handleGammaSliderChange(void *dp3, int d2) {
! set_gamma(d2);
! return d2;
! }
void video_menu (Game *game) {STACKTRACE
! int choice = -1;
! bool done = false;
!
while ( (choice != DIALOG_VIDEO_EXIT) && (!done) ) {
! sprintf(dialog_string[3], "%dx%d", videosystem.width, videosystem.height);
! //set index for resolution
! int x, y, x2, y2, i, bpp, bpp2, fs;
! x2 = videosystem.width;
! y2 = videosystem.height;
! for (i = 0; resolution[i+1]; i += 1) {
! x = strtol(resolution[i], NULL, 10);
! y = strtol(strchr(resolution[i], 'x') + 1, NULL, 10);
! if ((x == x2) && (y == y2)) break;
! }
! video_dialog[DIALOG_VIDEO_RESLIST].d1 = i;
!
! //set index for bpp
! bpp = videosystem.bpp;
! for (i = 0; true; i += 1) {
! if (!color_depth[i]) tw_error("video_menu - current bpp invalid?");
! if (strtol(color_depth[i], NULL, 10) == bpp) break;
! }
! video_dialog[DIALOG_VIDEO_BPPLIST].d1 = i;
!
! //set button for fullscreen
! video_dialog[DIALOG_VIDEO_FULLSCREEN].flags = videosystem.fullscreen ? D_SELECTED : 0;
!
! int startfs = video_dialog[DIALOG_VIDEO_FULLSCREEN].flags;
!
!
! //set gamma correction
! video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2 = get_gamma();
//do the dialog
***************
*** 249,253 ****
fs = video_dialog[DIALOG_VIDEO_FULLSCREEN].flags & D_SELECTED;
! switch (choice) {
case DIALOG_VIDEO_GET_DEFAULT:
set_config_file("client.ini");
--- 249,253 ----
fs = video_dialog[DIALOG_VIDEO_FULLSCREEN].flags & D_SELECTED;
! switch (choice) {
case DIALOG_VIDEO_GET_DEFAULT:
set_config_file("client.ini");
***************
*** 256,323 ****
y2 = get_config_int("Video", "ScreenHeight", 480);
fs = get_config_int("Video", "FullScreen", false);
! set_gamma(get_config_int("Video", "Gamma", 128));
!
! videosystem.set_resolution(x2, y2, bpp2, fs);
break;
!
case DIALOG_VIDEO_SET_DEFAULT:
if ((bpp2 != bpp) && game) {
tw_alert ("Color depths cannot be changed in\nthe middle of a game\nin this version", "Okay");
- }
- else {
- done = true;
}
! break;
!
! case DIALOG_VIDEO_BPPLIST:
! case DIALOG_VIDEO_RESLIST:
! break;
!
! case DIALOG_VIDEO_GAMMA_SLIDER:
! set_gamma(video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2);
! break;
!
! case DIALOG_VIDEO_EXIT:
! case -1:
! return;
! break;
! }
!
! if ( (x2 != x) ||
! (y2 != y) ||
! (bpp != bpp2) ||
! (startfs != fs) )
! {
! set_gamma(video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2);
! videosystem.set_resolution(x2, y2, bpp2, fs);
!
! if (confirmVideoChanges()) {
! set_config_file("client.ini");
! set_config_int("Video", "BitsPerPixel", bpp2);
! set_config_int("Video", "ScreenWidth", x2);
! set_config_int("Video", "ScreenHeight", y2);
! set_config_int("Video", "FullScreen", fs);
! set_config_int("Video", "Gamma", get_gamma());
! return;
! }
! else {
! set_config_file("client.ini");
! bpp2 = get_config_int("Video", "BitsPerPixel", 16);
! x2 = get_config_int("Video", "ScreenWidth", 640);
! y2 = get_config_int("Video", "ScreenHeight", 480);
! fs = get_config_int("Video", "FullScreen", false);
! set_gamma(get_config_int("Video", "Gamma", 128));
!
! i = videosystem.set_resolution(x2, y2, bpp2, fs);
! done = false;
! }
! }
!
}
return;
! }
!
! int handleSoundSliderChange(void *dp3, int d2);
int handleMusicSliderChange(void *dp3, int d2);
--- 256,323 ----
y2 = get_config_int("Video", "ScreenHeight", 480);
fs = get_config_int("Video", "FullScreen", false);
! set_gamma(get_config_int("Video", "Gamma", 128));
!
! videosystem.set_resolution(x2, y2, bpp2, fs);
break;
!
case DIALOG_VIDEO_SET_DEFAULT:
if ((bpp2 != bpp) && game) {
tw_alert ("Color depths cannot be changed in\nthe middle of a game\nin this version", "Okay");
}
! else {
! done = true;
! }
! break;
!
! case DIALOG_VIDEO_BPPLIST:
! case DIALOG_VIDEO_RESLIST:
! break;
!
! case DIALOG_VIDEO_GAMMA_SLIDER:
! set_gamma(video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2);
! break;
!
! case DIALOG_VIDEO_EXIT:
! case -1:
! return;
! break;
! }
!
! if ( (x2 != x) ||
! (y2 != y) ||
! (bpp != bpp2) ||
! (startfs != fs) )
! {
! set_gamma(video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2);
! videosystem.set_resolution(x2, y2, bpp2, fs);
!
! if (confirmVideoChanges()) {
! set_config_file("client.ini");
! set_config_int("Video", "BitsPerPixel", bpp2);
! set_config_int("Video", "ScreenWidth", x2);
! set_config_int("Video", "ScreenHeight", y2);
! set_config_int("Video", "FullScreen", fs);
! set_config_int("Video", "Gamma", get_gamma());
! return;
! }
! else {
! set_config_file("client.ini");
! bpp2 = get_config_int("Video", "BitsPerPixel", 16);
! x2 = get_config_int("Video", "ScreenWidth", 640);
! y2 = get_config_int("Video", "ScreenHeight", 480);
! fs = get_config_int("Video", "FullScreen", false);
! set_gamma(get_config_int("Video", "Gamma", 128));
!
! i = videosystem.set_resolution(x2, y2, bpp2, fs);
! done = false;
! }
! }
!
}
return;
! }
!
! int handleSoundSliderChange(void *dp3, int d2);
int handleMusicSliderChange(void *dp3, int d2);
***************
*** 342,346 ****
{ d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL },
{ NULL, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }
! };
void audio_menu (Game *game) {STACKTRACE
--- 342,346 ----
{ d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL },
{ NULL, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }
! };
void audio_menu (Game *game) {STACKTRACE
***************
*** 368,390 ****
};
! int handleSoundSliderChange(void *dp3, int d2) {
! sound.set_volumes(
! audio_dialog[DIALOG_AUDIO_SOUND_VOL].d2,
! audio_dialog[DIALOG_AUDIO_MUSIC_VOL].d2,
! audio_dialog[DIALOG_AUDIO_SOUND_ON].flags & D_SELECTED,
! audio_dialog[DIALOG_AUDIO_MUSIC_ON].flags & D_SELECTED
! );
! return 0;
! }
!
! int handleMusicSliderChange(void *dp3, int d2) {
! sound.set_volumes(
! audio_dialog[DIALOG_AUDIO_SOUND_VOL].d2,
! audio_dialog[DIALOG_AUDIO_MUSIC_VOL].d2,
! audio_dialog[DIALOG_AUDIO_SOUND_ON].flags & D_SELECTED,
! audio_dialog[DIALOG_AUDIO_MUSIC_ON].flags & D_SELECTED
! );
! return 0;
! }
--- 368,390 ----
};
! int handleSoundSliderChange(void *dp3, int d2) {
! sound.set_volumes(
! audio_dialog[DIALOG_AUDIO_SOUND_VOL].d2,
! audio_dialog[DIALOG_AUDIO_MUSIC_VOL].d2,
! audio_dialog[DIALOG_AUDIO_SOUND_ON].flags & D_SELECTED,
! audio_dialog[DIALOG_AUDIO_MUSIC_ON].flags & D_SELECTED
! );
! return 0;
! }
!
! int handleMusicSliderChange(void *dp3, int d2) {
! sound.set_volumes(
! audio_dialog[DIALOG_AUDIO_SOUND_VOL].d2,
! audio_dialog[DIALOG_AUDIO_MUSIC_VOL].d2,
! audio_dialog[DIALOG_AUDIO_SOUND_ON].flags & D_SELECTED,
! audio_dialog[DIALOG_AUDIO_MUSIC_ON].flags & D_SELECTED
! );
! return 0;
! }
|
