diff options
| author | Simon Howard | 2010-02-05 23:08:12 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-02-05 23:08:12 +0000 |
| commit | 677729c658b39f075e563fbc9f5a898641f7de54 (patch) | |
| tree | 109bae4ac22fbc6f8a34ba34a4e9fc6a33e75c48 /textscreen | |
| parent | 8a77b34e936a3fd752db3bc1113e3d7bd0555440 (diff) | |
| parent | b4f2d75b34b6e2b9bbb2fa6449125d3446a93a73 (diff) | |
| download | chocolate-doom-677729c658b39f075e563fbc9f5a898641f7de54.tar.gz chocolate-doom-677729c658b39f075e563fbc9f5a898641f7de54.tar.bz2 chocolate-doom-677729c658b39f075e563fbc9f5a898641f7de54.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1845
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 71736720..a0cbe3d6 100644 --- a/textscreen/txt_sdl.c +++ b/textscreen/txt_sdl.c @@ -289,10 +289,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) { |