diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-16 18:22:29 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-16 18:22:29 +0000 |
| commit | 42bde3cb0caf63ea19cfca4237d957c86390b977 (patch) | |
| tree | d4d11ebac689677a05cd6b66e4383ff98ecba955 /crawl-ref/source/tilereg.cc | |
| parent | 678e0a6c132e04803d98aed21c28a284568e9dda (diff) | |
| download | crawl-ref-42bde3cb0caf63ea19cfca4237d957c86390b977.tar.gz crawl-ref-42bde3cb0caf63ea19cfca4237d957c86390b977.zip | |
Apply my mouse speed-up commit to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9987 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 32231aafec..ace47f8066 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -323,15 +323,13 @@ static void _load_doll_data(const char *fn, dolls_data *doll) else { memset(fbuf, 0, sizeof(fbuf)); - int cur = 0; - if (fscanf(fp, "%s", fbuf) != EOF) + if (fscanf(fp, "%s", fbuf) == EOF) { -#if 0 - mpr("Read MODE."); - if (strcmp(fbuf, "MODE=LOADING") == 0) - mode0 = TILEP_M_LOADING; -#endif + // We're currently not interested in the MODE setting. (jpeg) + fclose(fp); + return; } + int cur = 0; if (fscanf(fp, "%s", fbuf) != EOF) { if (strncmp(fbuf, "NUM=", 4) == 0) @@ -932,6 +930,7 @@ int DungeonRegion::handle_mouse(MouseEvent &event) return 0; if (mouse_control::current_mode() == MOUSE_MODE_TARGET + || mouse_control::current_mode() == MOUSE_MODE_TARGET_PATH || mouse_control::current_mode() == MOUSE_MODE_TARGET_DIR) { if (event.event == MouseEvent::MOVE) |