equal
deleted
inserted
replaced
160 {$IFDEF SDL2} |
160 {$IFDEF SDL2} |
161 SDL_KEYDOWN: |
161 SDL_KEYDOWN: |
162 if GameState = gsChat then |
162 if GameState = gsChat then |
163 begin |
163 begin |
164 // sdl on iphone supports only ashii keyboards and the unicode field is deprecated in sdl 1.3 |
164 // sdl on iphone supports only ashii keyboards and the unicode field is deprecated in sdl 1.3 |
165 KeyPressChat(SDL_GetKeyFromScancode(event.key.keysym.sym), event.key.keysym.sym); //TODO correct for keymodifiers |
165 KeyPressChat(SDL_GetKeyFromScancode(event.key.keysym.sym), event.key.keysym.sym, event.key.keysym.modifier); |
166 end |
166 end |
167 else |
167 else |
168 if GameState >= gsGame then ProcessKey(event.key); |
168 if GameState >= gsGame then ProcessKey(event.key); |
169 SDL_KEYUP: |
169 SDL_KEYUP: |
170 if (GameState <> gsChat) and (GameState >= gsGame) then |
170 if (GameState <> gsChat) and (GameState >= gsGame) then |
206 onTouchUp(event.tfinger.x, event.tfinger.y, event.tfinger.fingerId); |
206 onTouchUp(event.tfinger.x, event.tfinger.y, event.tfinger.fingerId); |
207 {$ENDIF} |
207 {$ENDIF} |
208 {$ELSE} |
208 {$ELSE} |
209 SDL_KEYDOWN: |
209 SDL_KEYDOWN: |
210 if GameState = gsChat then |
210 if GameState = gsChat then |
211 KeyPressChat(event.key.keysym.unicode, event.key.keysym.sym) |
211 KeyPressChat(event.key.keysym.unicode, event.key.keysym.sym, event.key.keysym.modifier) |
212 else |
212 else |
213 if GameState >= gsGame then ProcessKey(event.key); |
213 if GameState >= gsGame then ProcessKey(event.key); |
214 SDL_KEYUP: |
214 SDL_KEYUP: |
215 if (GameState <> gsChat) and (GameState >= gsGame) then |
215 if (GameState <> gsChat) and (GameState >= gsGame) then |
216 ProcessKey(event.key); |
216 ProcessKey(event.key); |