[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.16,1.17 control.h,1.10,1.11

Robert G?ffringmann lavosspawn at users.sourceforge.net
Fri Jul 4 13:32:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv28757/sky

Modified Files:
	control.cpp control.h 
Log Message:
don't let user enter too long save names

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- control.cpp	4 Jul 2003 20:14:11 -0000	1.16
+++ control.cpp	4 Jul 2003 20:31:41 -0000	1.17
@@ -739,6 +739,8 @@
 			textBuf++;
 		textBuf[0] = 0;
 	} else {
+		if (_enteredTextWidth >= PAN_LINE_WIDTH - 10)
+			return;
         if (((key >= 'A') && (key <= 'Z')) || ((key >= 'a') && (key <= 'z')) ||
 			((key >= '0') && (key <= '9')) || checkKeyList(key)) {
 				uint8 strLen = 0;
@@ -771,9 +773,10 @@
 		}
 		nameBuf += MAX_TEXT_LEN;
 		nameSprites[cnt] = (dataFileHeader*)textSpr.textData;
-		if (firstNum + cnt == selectedGame)
+		if (firstNum + cnt == selectedGame) {
 			nameSprites[cnt]->flag = 1;
-		else
+			_enteredTextWidth = (uint16)textSpr.textWidth;
+		} else
 			nameSprites[cnt]->flag = 0;
 	}
 }

Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- control.h	4 Jul 2003 20:14:11 -0000	1.10
+++ control.h	4 Jul 2003 20:31:41 -0000	1.11
@@ -229,6 +229,7 @@
 	uint32 _curButtonText;
 	uint16 _firstText;
 	uint16 _savedMouse;
+	uint16 _enteredTextWidth;
     
 	SkyConResource *createResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, int16 pX, int16 pY, uint32 pText, uint8 pOnClick, uint8 panelType);
 





More information about the Scummvm-git-logs mailing list