mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: use range-based for loops and let count be correct count

This commit is contained in:
Rubidium 2024-04-07 21:55:40 +02:00 committed by rubidium42
parent 4718971ccc
commit 62f5c595f3
4 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/allegro_v.cpp
View File

@ -251,8 +251,8 @@ struct AllegroVkMapping {
uint8_t map_to;
};
#define AS(x, z) {x, 0, z}
#define AM(x, y, z, w) {x, y - x, z}
#define AS(x, z) {x, 1, z}
#define AM(x, y, z, w) {x, y - x + 1, z}
static const AllegroVkMapping _vk_mapping[] = {
/* Pageup stuff + up/down */
@ -312,12 +312,11 @@ static uint32_t ConvertAllegroKeyIntoMy(char32_t *character)
int scancode;
int unicode = ureadkey(&scancode);
const AllegroVkMapping *map;
uint key = 0;
for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
if ((uint)(scancode - map->vk_from) <= map->vk_count) {
key = scancode - map->vk_from + map->map_to;
for (const auto &map : _vk_mapping) {
if (IsInsideBS(scancode, map.vk_from, map.vk_count)) {
key = scancode - map.vk_from + map.map_to;
break;
}
}

24
src/video/sdl2_v.cpp
View File

@ -246,10 +246,10 @@ struct SDLVkMapping {
bool unprintable;
};
#define AS(x, z) {x, 0, z, false}
#define AM(x, y, z, w) {x, (uint8_t)(y - x), z, false}
#define AS_UP(x, z) {x, 0, z, true}
#define AM_UP(x, y, z, w) {x, (uint8_t)(y - x), z, true}
#define AS(x, z) {x, 1, z, false}
#define AM(x, y, z, w) {x, (uint8_t)(y - x + 1), z, false}
#define AS_UP(x, z) {x, 1, z, true}
#define AM_UP(x, y, z, w) {x, (uint8_t)(y - x + 1), z, true}
static const SDLVkMapping _vk_mapping[] = {
/* Pageup stuff + up/down */
@ -306,14 +306,13 @@ static const SDLVkMapping _vk_mapping[] = {
static uint ConvertSdlKeyIntoMy(SDL_Keysym *sym, char32_t *character)
{
const SDLVkMapping *map;
uint key = 0;
bool unprintable = false;
for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
if ((uint)(sym->sym - map->vk_from) <= map->vk_count) {
key = sym->sym - map->vk_from + map->map_to;
unprintable = map->unprintable;
for (const auto &map : _vk_mapping) {
if (IsInsideBS(sym, map.vk_from, map.vk_count)) {
key = sym->sym - map.vk_from + map.map_to;
unprintable = map.unprintable;
break;
}
}
@ -346,12 +345,11 @@ static uint ConvertSdlKeyIntoMy(SDL_Keysym *sym, char32_t *character)
*/
static uint ConvertSdlKeycodeIntoMy(SDL_Keycode kc)
{
const SDLVkMapping *map;
uint key = 0;
for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
if ((uint)(kc - map->vk_from) <= map->vk_count) {
key = kc - map->vk_from + map->map_to;
for (const auto &map : _vk_mapping) {
if (IsInsideBS(kc, map.vk_from, map.vk_count)) {
key = kc - map.vk_from + map.map_to;
break;
}
}

11
src/video/sdl_v.cpp
View File

@ -378,8 +378,8 @@ struct SDLVkMapping {
uint8_t map_to;
};
#define AS(x, z) {x, 0, z}
#define AM(x, y, z, w) {x, (uint8_t)(y - x), z}
#define AS(x, z) {x, 1, z}
#define AM(x, y, z, w) {x, (uint8_t)(y - x + 1), z}
static const SDLVkMapping _vk_mapping[] = {
/* Pageup stuff + up/down */
@ -435,12 +435,11 @@ static const SDLVkMapping _vk_mapping[] = {
static uint ConvertSdlKeyIntoMy(SDL_keysym *sym, char32_t *character)
{
const SDLVkMapping *map;
uint key = 0;
for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
if ((uint)(sym->sym - map->vk_from) <= map->vk_count) {
key = sym->sym - map->vk_from + map->map_to;
for (const auto &map : _vk_mapping) {
if (IsInsideBS(sym, map.vk_from, map.vk_count)) {
key = sym->sym - map.vk_from + map.map_to;
break;
}
}

11
src/video/win32_v.cpp
View File

@ -61,8 +61,8 @@ struct Win32VkMapping {
uint8_t map_to;
};
#define AS(x, z) {x, 0, z}
#define AM(x, y, z, w) {x, y - x, z}
#define AS(x, z) {x, 1, z}
#define AM(x, y, z, w) {x, y - x + 1, z}
static const Win32VkMapping _vk_mapping[] = {
/* Pageup stuff + up/down */
@ -107,12 +107,11 @@ static const Win32VkMapping _vk_mapping[] = {
static uint MapWindowsKey(uint sym)
{
const Win32VkMapping *map;
uint key = 0;
for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
if ((uint)(sym - map->vk_from) <= map->vk_count) {
key = sym - map->vk_from + map->map_to;
for (const auto &map : _vk_mapping) {
if (IsInsideBS(sym, map.vk_from, map.vk_count)) {
key = sym - map.vk_from + map.map_to;
break;
}
}