games/einstein: Added to 12.2 repository

5 files changed, 183 insertions, 0 deletions

diff --git a/games/einstein/patches/01_sdl.diff b/games/einstein/patches/01_sdl.diff
new file mode 100644
index 0000000000..480a1a519d
--- /dev/null
+++ b/games/einstein/patches/01_sdl.diff
@@ -0,0 +1,108 @@
+diff -ruN ../orig/einstein-2.0.dfsg.2/font.h ./font.h
+--- ../orig/einstein-2.0.dfsg.2/font.h	2005-08-16 00:33:17.000000000 +0200
++++ ./font.h	2007-08-31 10:00:33.000000000 +0200
+@@ -3,7 +3,7 @@
+ 
+ 
+ #include <string>
+-#include <SDL_ttf.h>
++#include <SDL/SDL_ttf.h>
+ 
+ 
+ class Font
+diff -ruN ../orig/einstein-2.0.dfsg.2/iconset.h ./iconset.h
+--- ../orig/einstein-2.0.dfsg.2/iconset.h	2005-08-14 04:40:58.000000000 +0200
++++ ./iconset.h	2007-08-31 09:51:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ #define __ICONSET_H__
+ 
+ 
+-#include <SDL.h>
++#include <SDL/SDL.h>
+ 
+ 
+ class IconSet
+diff -ruN ../orig/einstein-2.0.dfsg.2/main.cpp ./main.cpp
+--- ../orig/einstein-2.0.dfsg.2/main.cpp	2007-08-31 08:42:16.000000000 +0200
++++ ./main.cpp	2007-08-31 10:06:07.000000000 +0200
+@@ -1,8 +1,8 @@
+ #include <stdlib.h>
+ #include <iostream>
+-#include <SDL.h>
+-#include <SDL_main.h>
+-#include <SDL_ttf.h>
++#include <SDL/SDL.h>
++#include <SDL/SDL_main.h>
++#include <SDL/SDL_ttf.h>
+ #include "main.h"
+ #include "utils.h"
+ #include "storage.h"
+diff -ruN ../orig/einstein-2.0.dfsg.2/screen.cpp ./screen.cpp
+--- ../orig/einstein-2.0.dfsg.2/screen.cpp	2005-09-24 07:17:30.000000000 +0200
++++ ./screen.cpp	2007-08-31 09:52:07.000000000 +0200
+@@ -1,4 +1,4 @@
+-#include <SDL.h>
++#include <SDL/SDL.h>
+ #include "screen.h"
+ #include "exceptions.h"
+ #include "unicode.h"
+diff -ruN ../orig/einstein-2.0.dfsg.2/screen.h ./screen.h
+--- ../orig/einstein-2.0.dfsg.2/screen.h	2005-09-24 07:08:44.000000000 +0200
++++ ./screen.h	2007-08-31 09:52:26.000000000 +0200
+@@ -2,7 +2,7 @@
+ #define __SCREEN_H__
+ 
+ 
+-#include "SDL.h"
++#include "SDL/SDL.h"
+ #include <vector>
+ #include <list>
+ 
+diff -ruN ../orig/einstein-2.0.dfsg.2/sound.cpp ./sound.cpp
+--- ../orig/einstein-2.0.dfsg.2/sound.cpp	2005-09-24 08:32:07.000000000 +0200
++++ ./sound.cpp	2007-08-31 10:07:35.000000000 +0200
+@@ -1,7 +1,7 @@
+ #include "sound.h"
+ 
+ #include <iostream>
+-#include <SDL_events.h>
++#include <SDL/SDL_events.h>
+ #include "resources.h"
+ 
+ 
+diff -ruN ../orig/einstein-2.0.dfsg.2/sound.h ./sound.h
+--- ../orig/einstein-2.0.dfsg.2/sound.h	2005-09-24 08:24:20.000000000 +0200
++++ ./sound.h	2007-08-31 10:01:28.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ #include <string>
+ #include <map>
+-#include <SDL_mixer.h>
++#include <SDL/SDL_mixer.h>
+ 
+ 
+ class Sound
+diff -ruN ../orig/einstein-2.0.dfsg.2/utils.h ./utils.h
+--- ../orig/einstein-2.0.dfsg.2/utils.h	2005-08-14 04:40:58.000000000 +0200
++++ ./utils.h	2007-08-31 09:52:39.000000000 +0200
+@@ -1,7 +1,7 @@
+ #ifndef __UTILS_H__
+ #define __UTILS_H__
+ 
+-#include <SDL.h>
++#include <SDL/SDL.h>
+ #include <string>
+ #ifdef WIN32
+ #include <sys/time.h>
+diff -ruN ../orig/einstein-2.0.dfsg.2/widgets.h ./widgets.h
+--- ../orig/einstein-2.0.dfsg.2/widgets.h	2005-09-24 08:11:11.000000000 +0200
++++ ./widgets.h	2007-08-31 09:59:58.000000000 +0200
+@@ -4,7 +4,7 @@
+ #include <string>
+ #include <list>
+ #include <set>
+-#include <SDL.h>
++#include <SDL/SDL.h>
+ #include "font.h"
+ 
+ 
diff --git a/games/einstein/patches/02_prefix.diff b/games/einstein/patches/02_prefix.diff
new file mode 100644
index 0000000000..3ba7833bb2
--- /dev/null
+++ b/games/einstein/patches/02_prefix.diff
@@ -0,0 +1,11 @@
+--- ../orig/einstein-2.0.dfsg.2/main.cpp	2007-08-31 08:42:16.000000000 +0200
++++ main.cpp	2007-08-31 10:39:20.000000000 +0200
+@@ -70,7 +70,7 @@
+ #ifdef __APPLE__
+     dirs.push_back(getResourcesPath(selfPath));
+ #else
+-    dirs.push_back(PREFIX L"/share/einstein/res");
++    dirs.push_back("/usr" L"/share/einstein/res");
+     dirs.push_back(fromMbcs(getenv("HOME")) + L"/.einstein/res");
+ #endif
+ #endif
diff --git a/games/einstein/patches/06_srand.diff b/games/einstein/patches/06_srand.diff
new file mode 100644
index 0000000000..fff82848bd
--- /dev/null
+++ b/games/einstein/patches/06_srand.diff
@@ -0,0 +1,11 @@
+--- ../orig/einstein-2.0/puzgen.cpp	2005-08-14 04:40:58.000000000 +0200
++++ puzgen.cpp	2007-08-31 08:42:16.000000000 +0200
+@@ -313,6 +313,8 @@
+ 
+ void genPuzzle(SolvedPuzzle &puzzle, Rules &rules)
+ {
++    srand(time(NULL));
++
+     for (int i = 0; i < PUZZLE_SIZE; i++) {
+         for (int j = 0; j < PUZZLE_SIZE; j++) 
+             puzzle[i][j] = j + 1;
diff --git a/games/einstein/patches/07_long.diff b/games/einstein/patches/07_long.diff
new file mode 100644
index 0000000000..76a35c4288
--- /dev/null
+++ b/games/einstein/patches/07_long.diff
@@ -0,0 +1,31 @@
+--- ../orig/einstein-2.0/formatter.cpp	2005-08-14 04:40:58.000000000 +0200
++++ formatter.cpp	2007-08-31 08:42:16.000000000 +0200
+@@ -58,7 +58,7 @@
+             if ((c.type == INT_ARG) || (c.type == STRING_ARG) ||
+                     (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG))
+             {
+-                int no = (int)c.data;
++                long no = (long)c.data;
+                 args[no - 1] = c.type;
+             }
+         }
+@@ -123,7 +123,7 @@
+ std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const
+ {
+     std::wstring s;
+-    int no;
++    long no;
+ 
+     for (int i = 0; i < commandsCnt; i++) {
+         Command *cmd = &commands[i];
+@@ -135,8 +135,8 @@
+                 
+             case STRING_ARG:
+             case INT_ARG:
+-                no = (int)cmd->data - 1;
+-                if (no < (int)argValues.size())
++                no = (long)cmd->data - 1;
++                if (no < (long)argValues.size())
+                     s += argValues[no]->format(cmd);
+                 break;
+ 
diff --git a/games/einstein/patches/09_colors.diff b/games/einstein/patches/09_colors.diff
new file mode 100644
index 0000000000..5f1ddcebc3
--- /dev/null
+++ b/games/einstein/patches/09_colors.diff
@@ -0,0 +1,22 @@
+--- ../orig/einstein-2.0.dfsg.2/descr.cpp	2007-08-31 11:02:45.000000000 +0200
++++ descr.cpp	2007-08-31 13:48:19.000000000 +0200
+@@ -11,6 +11,7 @@
+ #include "convert.h"
+ #include "utils.h"
+ #include "tokenizer.h"
++#include "storage.h"
+ 
+ 
+ #define WIDTH		600
+@@ -259,7 +260,10 @@
+ {
+     if (0 < line.length()) {
+         page->add(new Label(&font, offsetX, offsetY + curPosY,
+-                    255,255,255, line, false));
++                    getStorage()->get(L"text_red", 0),
++                    getStorage()->get(L"text_green", 0),
++                    getStorage()->get(L"text_blue", 100),
++                    line, false));
+         line.clear();
+         curPosY += 10 + charHeight;
+         lineWidth = 0;