3 files changed, 15 insertions, 78 deletions

diff --git a/games/scramble/files/patch-src-perm.c b/games/scramble/files/patch-src-perm.c
deleted file mode 100644
index 18d88ac83412..000000000000
--- a/games/scramble/files/patch-src-perm.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/perm.c.orig	Sun Mar 27 03:45:59 2005
-+++ src/perm.c	Thu Nov 10 05:23:00 2005
-@@ -149,11 +149,11 @@
-  ****************************************************/
- static void resize()
- {
-+        struct node ** old_table = dictionary;
- 	unsigned int a;
-         size_t old_size = sizeOfTable, i;
-         sizeOfTable *= 2;
-         numOfEntries = 0;
--        struct node ** old_table = dictionary;
- 
-         dictionary = (struct node **)malloc(sizeof(struct node *) * sizeOfTable);
-         if(!dictionary) {
diff --git a/games/scramble/files/patch-src-scramble.c b/games/scramble/files/patch-src-scramble.c
index c132a9d61212..b1d590142c36 100644
--- a/games/scramble/files/patch-src-scramble.c
+++ b/games/scramble/files/patch-src-scramble.c
@@ -1,51 +1,20 @@
---- src/scramble.c.orig	Thu Nov 10 05:20:17 2005
-+++ src/scramble.c	Thu Nov 10 05:22:01 2005
-@@ -290,14 +290,13 @@
+--- src/scramble.c.orig	2013-08-28 03:08:02.758225796 +0400
++++ src/scramble.c	2013-08-28 03:08:42.456378896 +0400
+@@ -534,7 +534,7 @@
+ 
+ /*****************************************************
   ****************************************************/
- void putLetter(char * ch, int s)
+-int moveLetter(int i)
++void moveLetter(int i)
  {
--	if(!running)
--		return;
--
- 	char ch2[2];
-+	SDL_Rect dest;
- 	ch2[0] = toupper(ch[0]);
- 	ch2[1] = 0;
--
--	SDL_Rect dest;
-+
-+	if(!running)
-+		return;
- 
- 	s--;
- 	
-@@ -694,6 +693,8 @@
+ 	int minx, maxx, miny, maxy, advance;
+ 	i--;
+@@ -1141,7 +1141,7 @@
  
- 	for(i = 0; i < numberCurrentWords; i++) {
- 		if(strcmp(wordAttempt, currentWordSet[i]) == 0 && currentWordSetShow[i] == 0) {
-+			double per;
-+
- 			currentWordSetShow[i] = 1;
- 			playSound(hitSound);	
- 
-@@ -706,7 +707,7 @@
- 			stateChanged = 1;
- 			redrawAll = 1;
- 			wordsFound++;
--			double per = ((double)wordsFound / (double)numberCurrentWords);
-+			per = ((double)wordsFound / (double)numberCurrentWords);
- 			if(per > percentage) {
- 				nextLevel = 1;
- 				if(nextLevel % 5 && percentage < .8)
-@@ -1127,9 +1128,10 @@
+ /*****************************************************
   ****************************************************/
- void letter(char c)
+-inline void SE_CheckEvents()
++void SE_CheckEvents()
  {
-+	int i;
- 	if(!running)
- 		return;
--	int i;
-+
- 	for(i = 0; i < 6; i++) {
- 		if(c == letters[i].letter[0] && !letters[i].played) {
- 			playSound(clickSound);
+ 
+ 	SDL_Event event;
diff --git a/games/scramble/files/patch-src-sound.c b/games/scramble/files/patch-src-sound.c
deleted file mode 100644
index 357a0e863300..000000000000
--- a/games/scramble/files/patch-src-sound.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/sound.c.orig	Thu Nov 10 05:24:37 2005
-+++ src/sound.c	Thu Nov 10 05:22:26 2005
-@@ -46,12 +46,13 @@
- Mix_Chunk * loadSound(const char * name)
- {
- 	Mix_Chunk * temp;
-+	char * newname;
- 	int len1 = strlen(sg_data_path), len2 = strlen(name);
- 
- 	if(disabled)
- 		return NULL;
- 
--	char * newname = (char*)malloc(len1 + len2 + 1);
-+	newname = (char*)malloc(len1 + len2 + 1);
- 	if(newname == NULL) {
- 		fprintf(stderr, "Out of memory!\n");
- 		exit(1);