diff options
| author | Simon Howard | 2010-01-27 19:50:30 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-01-27 19:50:30 +0000 |
| commit | 0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e (patch) | |
| tree | 483f983aacbd9907290cf61f0e3b3afb1b03f7e9 /textscreen | |
| parent | 3cf74a97261b1a0aceb591b495b0857781918edd (diff) | |
| parent | a9e2d244a5a37fed344405e40698de2a2969c12a (diff) | |
| download | chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.tar.gz chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.tar.bz2 chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.zip | |
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1829
Diffstat (limited to 'textscreen')
| -rw-r--r-- | textscreen/.gitignore | 2 | ||||
| -rw-r--r-- | textscreen/examples/.gitignore | 2 | ||||
| -rw-r--r-- | textscreen/txt_sdl.c | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/textscreen/.gitignore b/textscreen/.gitignore index 6f6e5b3b..3be8ec0c 100644 --- a/textscreen/.gitignore +++ b/textscreen/.gitignore @@ -2,3 +2,5 @@ Makefile Makefile.in .deps *.a +tags +TAGS diff --git a/textscreen/examples/.gitignore b/textscreen/examples/.gitignore index b75bfc6b..cb0fd52c 100644 --- a/textscreen/examples/.gitignore +++ b/textscreen/examples/.gitignore @@ -4,3 +4,5 @@ Makefile guitest calculator *.exe +tags +TAGS diff --git a/textscreen/txt_sdl.c b/textscreen/txt_sdl.c index cd7dd77d..0df9fc93 100644 --- a/textscreen/txt_sdl.c +++ b/textscreen/txt_sdl.c @@ -285,10 +285,10 @@ void TXT_UpdateScreenArea(int x, int y, int w, int h) int x_end; int y_end; - x_end = LimitToRange(x + w, 0, TXT_SCREEN_W - 1); - y_end = LimitToRange(y + h, 0, TXT_SCREEN_H - 1); - x = LimitToRange(x, 0, TXT_SCREEN_W - 1); - y = LimitToRange(y, 0, TXT_SCREEN_H - 1); + x_end = LimitToRange(x + w, 0, TXT_SCREEN_W); + y_end = LimitToRange(y + h, 0, TXT_SCREEN_H); + x = LimitToRange(x, 0, TXT_SCREEN_W); + y = LimitToRange(y, 0, TXT_SCREEN_H); for (y1=y; y1<y_end; ++y1) { |