2 files changed, 17 insertions, 31 deletions

diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index 09c3fc80f8..7f6776a054 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -39,12 +39,10 @@ namespace Lab {
 Common::KeyState _keyPressed;
 
 Gadget *createButton(uint16 x, uint16 y, uint16 id, uint16 key, Image *im, Image *imalt) {
-	Gadget *gptr;
+	Gadget *gptr = new Gadget();
 
-	x = g_lab->_utils->vgaScaleX(x);
-
-	if ((gptr = new Gadget())) {
-		gptr->x = x;
+	if (gptr) {
+		gptr->x = g_lab->_utils->vgaScaleX(x);
 		gptr->y = y;
 		gptr->_gadgetID = id;
 		gptr->_keyEquiv = key;
@@ -53,12 +51,9 @@ Gadget *createButton(uint16 x, uint16 y, uint16 id, uint16 key, Image *im, Image
 
 		return gptr;
 	} else
-		return NULL;
+		return nullptr;
 }
 
-
-
-
 void freeButtonList(GadgetList *gadgetList) {
 	for (GadgetList::iterator gadget = gadgetList->begin(); gadget != gadgetList->end(); ++gadget) {
 		delete *gadget;
@@ -67,9 +62,6 @@ void freeButtonList(GadgetList *gadgetList) {
 	gadgetList->clear();
 }
 
-
-
-
 /*****************************************************************************/
 /* Draws a gadget list to the screen.                                        */
 /*****************************************************************************/
@@ -82,7 +74,6 @@ void drawGadgetList(GadgetList *gadgetList) {
 	}
 }
 
-
 /*****************************************************************************/
 /* Dims a gadget, and makes it unavailable for using.                        */
 /*****************************************************************************/
@@ -91,8 +82,6 @@ void disableGadget(Gadget *curgad, uint16 pencolor) {
 	curgad->_flags |= GADGETOFF;
 }
 
-
-
 /*****************************************************************************/
 /* Undims a gadget, and makes it available again.                            */
 /*****************************************************************************/
@@ -101,7 +90,6 @@ void enableGadget(Gadget *curgad) {
 	curgad->_flags &= !(GADGETOFF);
 }
 
-
 /*****************************************************************************/
 /* Make a key press have the right case for a gadget KeyEquiv value.         */
 /*****************************************************************************/
@@ -113,14 +101,14 @@ uint16 makeGadgetKeyEquiv(uint16 key) {
 }
 
 /*****************************************************************************/
-/* Checks whether or not the cords fall within one of the gadgets in a list  */
+/* Checks whether or not the coords fall within one of the gadgets in a list  */
 /* of gadgets.                                                               */
 /*****************************************************************************/
 Gadget *LabEngine::checkNumGadgetHit(GadgetList *gadgetList, uint16 key) {
 	uint16 gkey = key - '0';
 
 	if (!gadgetList)
-		return NULL;
+		return nullptr;
 
 	for (GadgetList::iterator gadgetItr = gadgetList->begin(); gadgetItr != gadgetList->end(); ++gadgetItr) {
 		Gadget *gadget = *gadgetItr;
@@ -145,26 +133,24 @@ Gadget *LabEngine::checkNumGadgetHit(GadgetList *gadgetList, uint16 key) {
 IntuiMessage IMessage;
 
 IntuiMessage *LabEngine::getMsg() {
-	Gadget *curgad;
-	int Qualifiers;
-
 	_event->updateMouse();
 
-	Qualifiers = _keyPressed.flags;
+	int qualifiers = _keyPressed.flags;
+	Gadget *curgad  = _event->mouseGadget();
 
-	if ((curgad = _event->mouseGadget()) != NULL) {
+	if (curgad) {
 		_event->updateMouse();
 		IMessage._msgClass = GADGETUP;
 		IMessage._code  = curgad->_gadgetID;
 		IMessage._gadgetID = curgad->_gadgetID;
-		IMessage._qualifier = Qualifiers;
+		IMessage._qualifier = qualifiers;
 		return &IMessage;
 	} else if (_event->mouseButton(&IMessage._mouseX, &IMessage._mouseY, true)) { /* Left Button */
-		IMessage._qualifier = IEQUALIFIER_LEFTBUTTON | Qualifiers;
+		IMessage._qualifier = IEQUALIFIER_LEFTBUTTON | qualifiers;
 		IMessage._msgClass = MOUSEBUTTONS;
 		return &IMessage;
 	} else if (_event->mouseButton(&IMessage._mouseX, &IMessage._mouseY, false)) { /* Right Button */
-		IMessage._qualifier = IEQUALIFIER_RBUTTON | Qualifiers;
+		IMessage._qualifier = IEQUALIFIER_RBUTTON | qualifiers;
 		IMessage._msgClass = MOUSEBUTTONS;
 		return &IMessage;
 	} else if (_event->keyPress(&IMessage._code)) { /* Keyboard key */
@@ -177,10 +163,10 @@ IntuiMessage *LabEngine::getMsg() {
 		} else
 			IMessage._msgClass = RAWKEY;
 
-		IMessage._qualifier = Qualifiers;
+		IMessage._qualifier = qualifiers;
 		return &IMessage;
 	} else
-		return NULL;
+		return nullptr;
 }
 
 } // End of namespace Lab
diff --git a/engines/lab/tilepuzzle.cpp b/engines/lab/tilepuzzle.cpp
index 2739473d47..4d95d4c4b5 100644
--- a/engines/lab/tilepuzzle.cpp
+++ b/engines/lab/tilepuzzle.cpp
@@ -243,7 +243,7 @@ void LabEngine::showTile(const char *filename, bool showsolution) {
 /*****************************************************************************/
 void LabEngine::doTileScroll(uint16 col, uint16 row, uint16 scrolltype) {
 	int16 dX = 0, dY = 0, dx = 0, dy = 0, sx = 0, sy = 0;
-	uint16 last = 0, x1, y1;
+	uint16 last = 0;
 
 	if (scrolltype == LEFTSCROLL) {
 		dX = _utils->vgaScaleX(5);
@@ -267,8 +267,8 @@ void LabEngine::doTileScroll(uint16 col, uint16 row, uint16 scrolltype) {
 
 	sx += _utils->svgaCord(2);
 
-	x1 = _utils->vgaScaleX(100) + (col * _utils->vgaScaleX(30)) + dx;
-	y1 = _utils->vgaScaleY(25) + (row * _utils->vgaScaleY(25)) + dy;
+	uint16 x1 = _utils->vgaScaleX(100) + (col * _utils->vgaScaleX(30)) + dx;
+	uint16 y1 = _utils->vgaScaleY(25) + (row * _utils->vgaScaleY(25)) + dy;
 
 	for (uint16 i = 0; i < last; i++) {
 		waitTOF();