Merge branch 'sdl2'
authorSteve Melenchuk <smelenchuk@gmail.com>
Thu, 20 Nov 2014 04:34:42 +0000 (21:34 -0700)
committerSteve Melenchuk <smelenchuk@gmail.com>
Thu, 20 Nov 2014 04:34:42 +0000 (21:34 -0700)
All of the major TODOs are done. It's high time we get a modern tiles
port... and a modern Android port.

Yay. Hooray.

Conflicts:
crawl-ref/source/Makefile
crawl-ref/source/message.cc

25 files changed:
1  2 
.travis.yml
crawl-ref/INSTALL.txt
crawl-ref/source/Makefile
crawl-ref/source/butcher.cc
crawl-ref/source/database.cc
crawl-ref/source/dbg-asrt.cc
crawl-ref/source/defines.h
crawl-ref/source/describe.cc
crawl-ref/source/enum.h
crawl-ref/source/files.cc
crawl-ref/source/fontwrapper-ft.cc
crawl-ref/source/hints.cc
crawl-ref/source/hiscores.cc
crawl-ref/source/libgui.cc
crawl-ref/source/libutil.cc
crawl-ref/source/macro.cc
crawl-ref/source/main.cc
crawl-ref/source/menu.cc
crawl-ref/source/message.cc
crawl-ref/source/prompt.cc
crawl-ref/source/skill_menu.cc
crawl-ref/source/startup.cc
crawl-ref/source/tilepick.cc
crawl-ref/source/tilesdl.cc
crawl-ref/source/viewmap.cc

diff --cc .travis.yml
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -243,12 -243,16 +243,16 @@@ bool TextDB::_needs_update() cons
      string ts;
      bool no_files = true;
  
 -    for (unsigned int i = 0; i < _input_files.size(); i++)
 +    for (const string &file : _input_files)
      {
 -        string full_input_path = _directory + _input_files[i];
 +        string full_input_path = _directory + file;
          full_input_path = datafile_path(full_input_path, !_parent);
          time_t mtime = file_modtime(full_input_path);
+ #ifdef __ANDROID__
+         if (file_exists(full_input_path))
+ #else
          if (mtime)
+ #endif
              no_files = false;
          char buf[20];
          snprintf(buf, sizeof(buf), ":%" PRId64, (int64_t)mtime);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -195,10 -193,9 +195,11 @@@ void update_screen(
  
  bool kbhit()
  {
 +    if (crawl_state.tiles_disabled)
 +        return false;
      // Look for the presence of any keyboard events in the queue.
-     int count = wm->get_event_count(WME_KEYDOWN);
+     int count = wm->get_event_count(WME_KEYDOWN)
+                 + wm->get_event_count(WME_KEYPRESS);
      return count > 0;
  }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge