First approach to port 2D UI Interface

- changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs
- necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile

1 files changed, 138 insertions, 136 deletions

diff --git a/src/common/misc.cpp b/src/common/misc.cpp
index 2427356..d4805e6 100644
--- a/src/common/misc.cpp
+++ b/src/common/misc.cpp
@@ -21,14 +21,16 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <direct.h>
+//#include <direct.h>
 #include <time.h>
-#include <d3d.h>
+//#include <d3d.h>
 
 #include "common/struct.h"
-#include "old/d3dengine.h"
-#include "old/d3dmath.h"
-#include "old/d3dutil.h"
+//#include "old/d3dengine.h"
+#include "graphics/engine/engine.h"
+//#include "old/d3dmath.h"
+//#include "math/math.h"
+//#include "old/d3dutil.h"
 #include "common/language.h"
 #include "common/event.h"
 #include "common/misc.h"
@@ -37,7 +39,7 @@
 
 CMetaFile   g_metafile;
 
-static EventMsg     g_uniqueEventMsg = EVENT_USER;
+static EventType    g_uniqueEventType = EVENT_USER;
 static bool         g_bUserDir = false;
 static char         g_userDir[100] = "";
 
@@ -45,84 +47,84 @@ static char         g_userDir[100] = "";
 
 // Gives a single user event.
 
-EventMsg GetUniqueEventMsg()
+EventType GetUniqueEventType()
 {
     int     i;
 
-    i = (int)g_uniqueEventMsg+1;
-    g_uniqueEventMsg = (EventMsg)i;
-    return g_uniqueEventMsg;
+    i = static_cast <int> (g_uniqueEventType+1);
+    g_uniqueEventType = static_cast<EventType>(i);
+    return g_uniqueEventType;
 }
 
 
 
 // Returns a non-accented letter.
 
-char RetNoAccent(char letter)
+char GetNoAccent(char letter)
 {
     if ( letter < 0 )
     {
-        if ( letter == 'á' ||
-             letter == 'à' ||
-             letter == 'â' ||
-             letter == 'ä' ||
-             letter == 'ã' )  return 'a';
-
-        if ( letter == 'é' ||
-             letter == 'è' ||
-             letter == 'ê' ||
-             letter == 'ë' )  return 'e';
-
-        if ( letter == 'í' ||
-             letter == 'ì' ||
-             letter == 'î' ||
-             letter == 'ï' )  return 'i';
-
-        if ( letter == 'ó' ||
-             letter == 'ò' ||
-             letter == 'ô' ||
-             letter == 'ö' ||
-             letter == 'õ' )  return 'o';
-
-        if ( letter == 'ú' ||
-             letter == 'ù' ||
-             letter == 'û' ||
-             letter == 'ü' )  return 'u';
-
-        if ( letter == 'ç' )  return 'c';
-
-        if ( letter == 'ñ' )  return 'n';
-
-        if ( letter == 'Á' ||
-             letter == 'À' ||
-             letter == 'Â' ||
-             letter == 'Ä' ||
-             letter == 'Ã' )  return 'A';
-
-        if ( letter == 'É' ||
-             letter == 'È' ||
-             letter == 'Ê' ||
-             letter == 'Ë' )  return 'E';
-
-        if ( letter == 'Í' ||
-             letter == 'Ì' ||
-             letter == 'Î' ||
-             letter == 'Ï' )  return 'I';
-
-        if ( letter == 'Ó' ||
-             letter == 'Ò' ||
-             letter == 'Ô' ||
-             letter == 'Ö' ||
-             letter == 'Õ' )  return 'O';
-
-        if ( letter == 'Ú' ||
-             letter == 'Ù' ||
-             letter == 'Û' ||
-             letter == 'Ü' )  return 'U';
-
-        if ( letter == 'Ç' )  return 'C';
-
-        if ( letter == 'Ñ' )  return 'N';
+        if ( letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' )  return 'a';
+
+        if ( letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' )  return 'e';
+
+        if ( letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' )  return 'i';
+
+        if ( letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' )  return 'o';
+
+        if ( letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' )  return 'u';
+
+        if ( letter == '�' )  return 'c';
+
+        if ( letter == '�' )  return 'n';
+
+        if ( letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' )  return 'A';
+
+        if ( letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' )  return 'E';
+
+        if ( letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' )  return 'I';
+
+        if ( letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' )  return 'O';
+
+        if ( letter == '�' ||
+             letter == '�' ||
+             letter == '�' ||
+             letter == '�' )  return 'U';
+
+        if ( letter == '�' )  return 'C';
+
+        if ( letter == '�' )  return 'N';
     }
 
     return letter;
@@ -130,40 +132,40 @@ char RetNoAccent(char letter)
 
 // Returns an uppercase letter.
 
-char RetToUpper(char letter)
+char GetToUpper(char letter)
 {
     if ( letter < 0 )
     {
-        if ( letter == 'á' )  return 'Á';
-        if ( letter == 'à' )  return 'À';
-        if ( letter == 'â' )  return 'Â';
-        if ( letter == 'ä' )  return 'Ä';
-        if ( letter == 'ã' )  return 'Ã';
-
-        if ( letter == 'é' )  return 'É';
-        if ( letter == 'è' )  return 'È';
-        if ( letter == 'ê' )  return 'Ê';
-        if ( letter == 'ë' )  return 'Ë';
-
-        if ( letter == 'í' )  return 'Í';
-        if ( letter == 'ì' )  return 'Ì';
-        if ( letter == 'î' )  return 'Î';
-        if ( letter == 'ï' )  return 'Ï';
-
-        if ( letter == 'ó' )  return 'Ó';
-        if ( letter == 'ò' )  return 'Ò';
-        if ( letter == 'ô' )  return 'Ô';
-        if ( letter == 'ö' )  return 'Ö';
-        if ( letter == 'õ' )  return 'Õ';
-
-        if ( letter == 'ú' )  return 'Ú';
-        if ( letter == 'ù' )  return 'Ù';
-        if ( letter == 'û' )  return 'Û';
-        if ( letter == 'ü' )  return 'Ü';
-
-        if ( letter == 'ç' )  return 'Ç';
-
-        if ( letter == 'ñ' )  return 'Ñ';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
     }
 
     return toupper(letter);
@@ -171,40 +173,40 @@ char RetToUpper(char letter)
 
 // Returns a lowercase letter.
 
-char RetToLower(char letter)
+char GetToLower(char letter)
 {
     if ( letter < 0 )
     {
-        if ( letter == 'Á' )  return 'á';
-        if ( letter == 'À' )  return 'à';
-        if ( letter == 'Â' )  return 'â';
-        if ( letter == 'Ä' )  return 'ä';
-        if ( letter == 'Ã' )  return 'ã';
-
-        if ( letter == 'É' )  return 'é';
-        if ( letter == 'È' )  return 'è';
-        if ( letter == 'Ê' )  return 'ê';
-        if ( letter == 'Ë' )  return 'ë';
-
-        if ( letter == 'Í' )  return 'í';
-        if ( letter == 'Ì' )  return 'ì';
-        if ( letter == 'Î' )  return 'î';
-        if ( letter == 'Ï' )  return 'ï';
-
-        if ( letter == 'Ó' )  return 'ó';
-        if ( letter == 'Ò' )  return 'ò';
-        if ( letter == 'Ô' )  return 'ô';
-        if ( letter == 'Ö' )  return 'ö';
-        if ( letter == 'Õ' )  return 'õ';
-
-        if ( letter == 'Ú' )  return 'ú';
-        if ( letter == 'Ù' )  return 'ù';
-        if ( letter == 'Û' )  return 'û';
-        if ( letter == 'Ü' )  return 'ü';
-
-        if ( letter == 'Ç' )  return 'ç';
-
-        if ( letter == 'Ñ' )  return 'ñ';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
+
+        if ( letter == '�' )  return '�';
     }
 
     return tolower(letter);
@@ -213,7 +215,7 @@ char RetToLower(char letter)
 
 // Converting time to string.
 
-void TimeToAscii(time_t time, char *buffer)
+void GimeToAscii(time_t time, char *buffer)
 {
     struct tm   when;
     int         year;
@@ -311,7 +313,7 @@ bool CopyFileToTemp(char* filename)
     UserDir(dst, filename, "textures");
     strcpy(g_userDir, save);
 
-    _mkdir("temp");
+//    _mkdir("temp"); TODO
     if ( !Xfer(src, dst) )  return false;
 
     strcpy(filename, dst);