petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Fix: VkMapping declarations violated C++ ODR rule.

Browse Source
This commit is contained in:
milek7
2021-02-14 14:06:19 +01:00
committed by Loïc Guilloux
parent 5a1fa18509
commit 751f595bb6
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/allegro_v.cpp
View File

@@ -235,7 +235,7 @@ bool VideoDriver_Allegro::ClaimMousePointer()
return true;
}
struct VkMapping {
struct AllegroVkMapping {
uint16 vk_from;
byte vk_count;
byte map_to;
@@ -244,7 +244,7 @@ struct VkMapping {
#define AS(x, z) {x, 0, z}
#define AM(x, y, z, w) {x, y - x, z}
static const VkMapping _vk_mapping[] = {
static const AllegroVkMapping _vk_mapping[] = {
/* Pageup stuff + up/down */
AM(KEY_PGUP, KEY_PGDN, WKC_PAGEUP, WKC_PAGEDOWN),
AS(KEY_UP, WKC_UP),
@@ -302,7 +302,7 @@ static uint32 ConvertAllegroKeyIntoMy(WChar *character)
int scancode;
int unicode = ureadkey(&scancode);
const VkMapping *map;
const AllegroVkMapping *map;
uint key = 0;
for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {