Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-27 19:10:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix remaining VS compiler warnings in test programs

Browse Source
This commit is contained in:
Albrecht Schlosser
2021-11-16 21:05:33 +01:00
parent f0ff8a5083
commit 5810edaf84
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/blocks.cxx
+10 -10
View File
@@ -60,9 +60,9 @@
// (b) click on a "normal block", destroy this one and adjacent blocks // (b) click on a "normal block", destroy this one and adjacent blocks
// (c) click on a "bomb", destroy all blocks of the same color // (c) click on a "bomb", destroy all blocks of the same color
#define LEVEL_FACTOR 0.90 // was: 0.95 #define LEVEL_FACTOR 0.900f // was: 0.95
#define NORMAL_FACTOR 0.999 #define NORMAL_FACTOR 0.999f
#define BOMB_FACTOR 0.995 #define BOMB_FACTOR 0.995f
// Set this to 1 to debug the timer callback (should be 0) // Set this to 1 to debug the timer callback (should be 0)
#define DEBUG_TIMER 0 #define DEBUG_TIMER 0
@@ -309,8 +309,8 @@ BlockSound::BlockSound() {
for (int j = max_sample; j > 0; j --, sample_ptr ++) { for (int j = max_sample; j > 0; j --, sample_ptr ++) {
float freq = (float)j / (float)max_sample; float freq = (float)j / (float)max_sample;
float volume = 32767.0 * (0.5 * sqrt(freq) + 0.5); float volume = float(32767.0 * (0.5 * sqrt(freq) + 0.5));
float sample = 0.0001 * ((rand() % 20001) - 10000); float sample = float(0.0001 * ((rand() % 20001) - 10000));
*sample_ptr = (int)(volume * freq * sample + *sample_ptr = (int)(volume * freq * sample +
(1.0 - freq) * sample_ptr[-2]); (1.0 - freq) * sample_ptr[-2]);
@@ -785,12 +785,12 @@ int BlockWindow::handle(int event) {
count --; count --;
if (b->bomb) { if (b->bomb) {
sound_->play_explosion(0.19 + 0.005 * count); sound_->play_explosion(float(0.19 + 0.005 * count));
interval_ *= BOMB_FACTOR; interval_ *= BOMB_FACTOR;
score_ += count; score_ += count;
} else { } else {
sound_->play_explosion(0.09 + 0.005 * count); sound_->play_explosion(float(0.09 + 0.005 * count));
interval_ *= NORMAL_FACTOR; interval_ *= NORMAL_FACTOR;
score_ += count * count; score_ += count * count;
@@ -841,11 +841,11 @@ void BlockWindow::init() {
// Start a new game... // Start a new game...
void BlockWindow::new_game() { void BlockWindow::new_game() {
// Seed the random number generator... // Seed the random number generator...
srand(time(NULL)); srand((unsigned int)time(NULL));
init(); init();
interval_ = 0.1; interval_ = 0.1f;
opened_columns_ = 0; opened_columns_ = 0;
strcpy(title_, "Level: 1"); strcpy(title_, "Level: 1");
@@ -1006,7 +1006,7 @@ void BlockWindow::timeout_cb(BlockWindow *bw) {
if (bw->num_columns_ == BLOCK_COLS) { if (bw->num_columns_ == BLOCK_COLS) {
bw->interval_ = -1.0; bw->interval_ = -1.0;
bw->sound_->play_explosion(0.8); bw->sound_->play_explosion(0.8f);
bw->play_button_->label("@>"); bw->play_button_->label("@>");
} else { } else {
bw->opened_columns_ ++; bw->opened_columns_ ++;
test/editor.cxx
+7 -7
View File
@@ -658,8 +658,8 @@ void find2_cb(Fl_Widget* w, void* v) {
int found = textbuf->search_forward(pos, e->search, &pos); int found = textbuf->search_forward(pos, e->search, &pos);
if (found) { if (found) {
// Found a match; select and update the position... // Found a match; select and update the position...
textbuf->select(pos, pos+strlen(e->search)); textbuf->select(pos, pos + (int)strlen(e->search));
e->editor->insert_position(pos+strlen(e->search)); e->editor->insert_position(pos + (int)strlen(e->search));
e->editor->show_insert_position(); e->editor->show_insert_position();
} }
else fl_alert("No occurrences of \'%s\' found!", e->search); else fl_alert("No occurrences of \'%s\' found!", e->search);
@@ -773,11 +773,11 @@ void replace2_cb(Fl_Widget*, void* v) {
if (found) { if (found) {
// Found a match; update the position and replace text... // Found a match; update the position and replace text...
textbuf->select(pos, pos+strlen(find)); textbuf->select(pos, pos + (int)strlen(find));
textbuf->remove_selection(); textbuf->remove_selection();
textbuf->insert(pos, replace); textbuf->insert(pos, replace);
textbuf->select(pos, pos+strlen(replace)); textbuf->select(pos, pos + (int)strlen(replace));
e->editor->insert_position(pos+strlen(replace)); e->editor->insert_position(pos + (int)strlen(replace));
e->editor->show_insert_position(); e->editor->show_insert_position();
} }
else fl_alert("No occurrences of \'%s\' found!", find); else fl_alert("No occurrences of \'%s\' found!", find);
@@ -807,10 +807,10 @@ void replall_cb(Fl_Widget*, void* v) {
if (found) { if (found) {
// Found a match; update the position and replace text... // Found a match; update the position and replace text...
textbuf->select(pos, pos+strlen(find)); textbuf->select(pos, pos + (int)strlen(find));
textbuf->remove_selection(); textbuf->remove_selection();
textbuf->insert(pos, replace); textbuf->insert(pos, replace);
e->editor->insert_position(pos+strlen(replace)); e->editor->insert_position(pos + (int)strlen(replace));
e->editor->show_insert_position(); e->editor->show_insert_position();
times++; times++;
} }
test/fractals.cxx
+3 -3
View File
@@ -754,11 +754,11 @@ void MenuInit(void)
/***************************************************************/ /***************************************************************/
// FLTK-style callbacks to Glut menu callback translators: // FLTK-style callbacks to Glut menu callback translators:
void setlevel(Fl_Widget*, void *value) {setlevel(fl_intptr_t(value));} void setlevel(Fl_Widget*, void *value) {setlevel(fl_int(value));}
void choosefract(Fl_Widget*, void *value) {choosefract(fl_intptr_t(value));} void choosefract(Fl_Widget*, void *value) {choosefract(fl_int(value));}
void handlemenu(Fl_Widget*, void *value) {handlemenu(fl_intptr_t(value));} void handlemenu(Fl_Widget*, void *value) {handlemenu(fl_int(value));}
#include <FL/Fl_Button.H> #include <FL/Fl_Button.H>
#include <FL/Fl_Group.H> #include <FL/Fl_Group.H>