Browse Source

Removed UNICODE_SUPPORT macro

Thomas Buck 11 years ago
parent
commit
bd4340aa40
3 changed files with 1 additions and 17 deletions
  1. 1
    0
      ChangeLog
  2. 0
    1
      Makefile
  3. 0
    16
      src/SDLSystem.cpp

+ 1
- 0
ChangeLog View File

7
 
7
 
8
 	[ 20140216 ]
8
 	[ 20140216 ]
9
 	* Removed the FastCard option. Not necessary on todays hardware?!
9
 	* Removed the FastCard option. Not necessary on todays hardware?!
10
+	* Removed UNICODE_SUPPORT, not working this way with SDL2
10
 
11
 
11
 	[ 20140215 ]
12
 	[ 20140215 ]
12
 	* Enabled previously disabled polygon smoothing & color material
13
 	* Enabled previously disabled polygon smoothing & color material

+ 0
- 1
Makefile View File

26
 ###############################################################
26
 ###############################################################
27
 
27
 
28
 # -DMULTITEXTURE			Add OpenGL multitexturing
28
 # -DMULTITEXTURE			Add OpenGL multitexturing
29
-# -DUNICODE_SUPPORT			Add unicode/internation keyboard support
30
 # -DUSING_EMITTER_IN_GAME	Run particle test in game
29
 # -DUSING_EMITTER_IN_GAME	Run particle test in game
31
 
30
 
32
 BASE_DEFS=-Iinclude -DUSING_EMITTER
31
 BASE_DEFS=-Iinclude -DUSING_EMITTER

+ 0
- 16
src/SDLSystem.cpp View File

101
             width, height, flags);
101
             width, height, flags);
102
     mGLContext = SDL_GL_CreateContext(mWindow);
102
     mGLContext = SDL_GL_CreateContext(mWindow);
103
 
103
 
104
-#ifdef UNICODE_SUPPORT
105
-    //@JML get Unicode value of key for international keyboard
106
-    SDL_EnableUNICODE(1);
107
-#endif
108
-
109
     // Start game renderer
104
     // Start game renderer
110
     initGL();
105
     initGL();
111
 
106
 
303
                     }
298
                     }
304
 #endif
299
 #endif
305
 
300
 
306
-#ifdef UNICODE_SUPPORT
307
-                    // JML: if a std key was pressed get it ascii code
308
-                    if (!specialKey && key != 0) {
309
-                        if ((event.key.keysym.unicode & 0xFF80) == 0) {
310
-                            key = (unsigned int)(event.key.keysym.unicode & 0x7F);
311
-                        } else {
312
-                            key = 0;
313
-                        }
314
-                    }
315
-#else
316
                     /*! \fixme Avoid passing modifers as a key, since the
301
                     /*! \fixme Avoid passing modifers as a key, since the
317
                      * consoles using this expect text characters, add unicode
302
                      * consoles using this expect text characters, add unicode
318
                      * support later when they're able to handle it
303
                      * support later when they're able to handle it
320
                     if (key > 255 && key < 1000) {
305
                     if (key > 255 && key < 1000) {
321
                         key = 0;
306
                         key = 0;
322
                     }
307
                     }
323
-#endif
324
 
308
 
325
                     if (key == mConsoleKey) {
309
                     if (key == mConsoleKey) {
326
                         if (event.type == SDL_KEYDOWN) {
310
                         if (event.type == SDL_KEYDOWN) {

Loading…
Cancel
Save