pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some compiler warnings

Browse source
This commit is contained in:
Dimitris Panokostas 2017-09-30 12:32:12 +02:00
parent 0646927e7a
commit a7ed7a59e9
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
VSLinux/guisan/guisan.vcxproj
View file

@ -45,6 +45,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
<RemoteRootDir>~/projects/Amiberry-sdl2/src</RemoteRootDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>

2
src/osdep/amiberry_gui.cpp
View file

@ -512,11 +512,13 @@ void gui_display(int shortcut)
void moveVertical(int value)
{
#ifdef PANDORA
changed_prefs.pandora_vertical_offset += value;
if(changed_prefs.pandora_vertical_offset < -16 + OFFSET_Y_ADJUST)
changed_prefs.pandora_vertical_offset = -16 + OFFSET_Y_ADJUST;
else if(changed_prefs.pandora_vertical_offset > 16 + OFFSET_Y_ADJUST)
changed_prefs.pandora_vertical_offset = 16 + OFFSET_Y_ADJUST;
#endif
}
void gui_led(int led, int on)

12
src/osdep/amiberry_input.cpp
View file

@ -40,14 +40,14 @@ static int get_mouse_num()
return 2;
}
static TCHAR* get_mouse_friendlyname(int mouse)
static const TCHAR* get_mouse_friendlyname(int mouse)
{
if (mouse == 0)
return "Mouse";
return "dPad as mouse";
}
static TCHAR* get_mouse_uniquename(int mouse)
static const TCHAR* get_mouse_uniquename(int mouse)
{
if (mouse == 0)
return "MOUSE0";
@ -201,12 +201,12 @@ static int get_kb_num()
return 1;
}
static TCHAR* get_kb_friendlyname(int kb)
static const TCHAR* get_kb_friendlyname(int kb)
{
return strdup("Default Keyboard");
}
static TCHAR* get_kb_uniquename(int kb)
static const TCHAR* get_kb_uniquename(int kb)
{
return strdup("KEYBOARD0");
}
@ -325,14 +325,14 @@ static void unacquire_joystick(int num)
{
}
static TCHAR* get_joystick_friendlyname(int joy)
static const TCHAR* get_joystick_friendlyname(int joy)
{
if (joy == 0)
return "Built-in joystick";
return JoystickName[joy - 1];
}
static TCHAR* get_joystick_uniquename(int joy)
static const TCHAR* get_joystick_uniquename(int joy)
{
if (joy == 0)
return "JOY0";