Merge tag '1.11.0-beta2' into jgrpp
# Conflicts: # .github/workflows/ci-build.yml # .github/workflows/release.yml # CMakeLists.txt # src/blitter/32bpp_optimized.cpp # src/debug.cpp # src/gfx.cpp # src/gfx_func.h # src/lang/czech.txt # src/lang/english.txt # src/lang/italian.txt # src/lang/swedish.txt # src/lang/ukrainian.txt # src/network/network_server.cpp # src/os/windows/crashlog_win.cpp # src/os/windows/win32.cpp # src/pathfinder/follow_track.hpp # src/screenshot.cpp # src/settings_type.h # src/spritecache.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/video/video_driver.cpp # src/video/video_driver.hpp # src/video/win32_v.cpp
This commit is contained in:
@@ -328,7 +328,7 @@ static uint32 ConvertAllegroKeyIntoMy(WChar *character)
|
||||
static const uint LEFT_BUTTON = 0;
|
||||
static const uint RIGHT_BUTTON = 1;
|
||||
|
||||
static void PollEvent()
|
||||
bool VideoDriver_Allegro::PollEvent()
|
||||
{
|
||||
poll_mouse();
|
||||
|
||||
@@ -402,6 +402,8 @@ static void PollEvent()
|
||||
uint keycode = ConvertAllegroKeyIntoMy(&character);
|
||||
HandleKeypress(keycode, character);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -475,9 +477,6 @@ void VideoDriver_Allegro::InputLoop()
|
||||
void VideoDriver_Allegro::MainLoop()
|
||||
{
|
||||
for (;;) {
|
||||
InteractiveRandom(); // randomness
|
||||
|
||||
PollEvent();
|
||||
if (_exit_game) return;
|
||||
|
||||
if (this->Tick()) {
|
||||
|
||||
Reference in New Issue
Block a user