[Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.1,1.2
Max Horn
fingolfin at users.sourceforge.net
Sun Jul 27 19:15:10 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm configure,1.31,1.32
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 console.h,1.1,1.2 interpreter.h,1.1,1.2 maketext.cpp,1.1,1.2 mem_view.cpp,1.1,1.2 mem_view.h,1.1,1.2 mouse.cpp,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv6340
Modified Files:
controls.cpp
Log Message:
more warnings
Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/controls.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- controls.cpp 28 Jul 2003 01:44:37 -0000 1.1
+++ controls.cpp 28 Jul 2003 02:14:28 -0000 1.2
@@ -205,11 +205,8 @@
// 1 for restored ok
- uint8 *colTablePtr=NULL;
-
int breakOut=0;
uint32 j;
- uint8 black[4]={0,0,0,0};
char key_press=0;
uint8 description[SAVE_DESCRIPTION_LEN];
uint8 buf[8][SAVE_DESCRIPTION_LEN];
@@ -897,11 +894,8 @@
//largely the same as the restore code
- uint8 *colTablePtr=NULL;
-
int breakOut=0;
uint32 j;
- uint8 black[4]={0,0,0,0};
char key_press;
uint8 description[SAVE_DESCRIPTION_LEN];
uint8 buf[8][SAVE_DESCRIPTION_LEN];
@@ -914,14 +908,13 @@
uint32 slab_text_x;
uint32 slab_text_y;
- uint32 slot=1000; //nothing selected
- uint32 clicked_slot, edit_screen_slot=1000;
+ uint32 clicked_slot=1000, edit_screen_slot=1000;
uint32 cur_slot_states[9];
int scroll_rate=0;
// static uint32 base_slot=0;
- int edit_pos, first_chr, flash=0;
+ int edit_pos=0, first_chr=0, flash=0;
uint8 save_text[MAX_STRING_LEN];
uint8 cancel_text[MAX_STRING_LEN];
@@ -931,7 +924,7 @@
uint32 rv; // return value for SaveGame
- uint32 edit_width;
+ uint32 edit_width=0;
int names_built=0;
@@ -1603,7 +1596,6 @@
// returns 1 for OK pressed
// returns 0 for CANCEL pressed
- uint8 black[4]={0,0,0,0};
int breakOut=0;
char c;
@@ -2082,7 +2074,6 @@
#define WORD_BUTTON_GAP 10
// some things left by the last tennant
- uint8 black[4] = {0,0,0,0};
char c;
_mouseEvent *me;
int first = 0;
@@ -2108,14 +2099,14 @@
uint8 grfxLevel = GetRenderType();
// safe slider values for restoring on cancel
- uint8 safe_musicVolume = musicVolume;
- uint8 safe_speechVolume = speechVolume;
- uint8 safe_fxVolume = fxVolume;
+ //uint8 safe_musicVolume = musicVolume;
+ //uint8 safe_speechVolume = speechVolume;
+ //uint8 safe_fxVolume = fxVolume;
uint8 safe_grfxLevel = grfxLevel;
// button state variables
uint8 dreverse_stereo_state = 0, dmusic_mute_state = 0, dspeech_mute_state = 0, dfx_mute_state = 0, dobject_state = 0, dsubtitle_state = 0;
- uint8 touching_reverse_stereo, touching_music_mute, touching_fx_mute, touching_speech_mute, touching_object, touching_subtitle;
+ uint8 touching_reverse_stereo = 0, touching_music_mute = 0, touching_fx_mute = 0, touching_speech_mute = 0, touching_object = 0, touching_subtitle = 0;
uint8 lb_down = 0;
// Slider targets
- Previous message: [Scummvm-cvs-logs] CVS: scummvm configure,1.31,1.32
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 console.h,1.1,1.2 interpreter.h,1.1,1.2 maketext.cpp,1.1,1.2 mem_view.cpp,1.1,1.2 mem_view.h,1.1,1.2 mouse.cpp,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list