Applying patches by Michi to Enigma

This commit is contained in:
pelya
2010-10-15 14:23:30 +03:00
parent 679f64d3a0
commit ebaff58990
15 changed files with 141 additions and 84 deletions

View File

@@ -216,6 +216,8 @@ void MouseCursor::set_image (ecl::Surface *s, int hx, int hy) {
}
void MouseCursor::draw () {
// we do not need a mouse cursor on a touchscreen device
#ifndef ANDROID
if (visible > 0) {
grab_bg();
@@ -225,6 +227,7 @@ void MouseCursor::draw () {
changedp = false;
}
#endif
}
void MouseCursor::redraw () {
@@ -335,6 +338,7 @@ namespace
VM_640x480,
false, // 640x512 is deprecated!
},
#ifndef ANDROID
{
VM_800x600, 800, 600, 40, "800x600",
"models-40.lua", "gfx40/",
@@ -361,6 +365,7 @@ namespace
Rect (260, 655, 710, 40), // text area
VM_640x480, true,
},
#endif
};
VideoModes current_video_mode = VM_None;