Ticket #9120: sci_uninitialized_variable_warnings.patch

engines/sci/gui/gui_text.cpp

@@ -355 +355 @@
 
 // Draws a text in rect.
 void SciGuiText::Box(const char *text, int16 bshow, const Common::Rect &rect, GuiTextAlignment alignment, GuiResourceId fontId) {
-        int16 textWidth, textHeight, charCount, offset;
+        int16 textWidth, textHeight, charCount;
+        int16 offset = 0;
         int16 hline = 0;
         GuiResourceId orgFontId = GetFontId();
         int16 orgPenColor = _gfx->_curPort->penClr;
@@ -380 +381 @@
                         offset = (rect.width() - textWidth) / 2;
                         break;
                 case SCI_TEXT_ALIGNMENT_LEFT:
-                        offset = 0;
+                        // Nothing to do
                         break;
 
                 default: // left-aligned

engines/sci/resource.cpp

@@ -955 +955 @@
 
         Common::String mask, name;
         Common::ArchiveMemberList files;
-        int number;
+        int number = -1;
         const char *szResType;
         ResourceSource *psrcPatch;
-        bool bAdd;
 
         for (int i = kResourceTypeView; i < kResourceTypeAudio36; i ++) {
                 files.clear();
@@ -972 +971 @@
                 mask += resourceTypeSuffixes[i];
                 SearchMan.listMatchingMembers(files, mask);
                 for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); x++) {
-                        bAdd = false;
                         name = (*x)->getName();
                         // SCI1 scheme
                         if (isdigit(name[0])) {
                                 number = atoi(name.c_str());
-                                bAdd = true;
                         } else {
                                 // SCI0 scheme
                                 int resname_len = strlen(szResType);
                                 if (scumm_strnicmp(name.c_str(), szResType, resname_len) == 0
                                         && !isalpha(name[resname_len + 1])) {
                                         number = atoi(name.c_str() + resname_len + 1);
-                                        bAdd = true;
                                 }
                         }
 
-                        if (bAdd) {
-                                psrcPatch = new ResourceSource;
-                                psrcPatch->source_type = kSourcePatch;
-                                psrcPatch->location_name = name;
-                                processPatch(psrcPatch, (ResourceType)i, number);
-                        }
+                        psrcPatch = new ResourceSource;
+                        psrcPatch->source_type = kSourcePatch;
+                        psrcPatch->location_name = name;
+                        processPatch(psrcPatch, (ResourceType)i, number);
                 }
         }
 }