diff options
| author | Paweł Kołodziejski | 2004-05-01 16:15:55 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-05-01 16:15:55 +0000 |
| commit | 0af53f3c97075e380aab15bcc8dd7126b05bd9c4 (patch) | |
| tree | a2f929125159a287518df2a70f11d58561dd954e /saga/transitions.cpp | |
| parent | d84d93b5d0709e95dec412fe8c9b4e5c2dfa9e2e (diff) | |
| download | scummvm-rg350-0af53f3c97075e380aab15bcc8dd7126b05bd9c4.tar.gz scummvm-rg350-0af53f3c97075e380aab15bcc8dd7126b05bd9c4.tar.bz2 scummvm-rg350-0af53f3c97075e380aab15bcc8dd7126b05bd9c4.zip | |
indent
svn-id: r13715
Diffstat (limited to 'saga/transitions.cpp')
| -rw-r--r-- | saga/transitions.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/saga/transitions.cpp b/saga/transitions.cpp index 1e267de599..c97b3a46fa 100644 --- a/saga/transitions.cpp +++ b/saga/transitions.cpp @@ -20,13 +20,8 @@ * $Header$ * */ -/* - Description: - - Background transition routines - Notes: -*/ +//Background transition routines #include <stdio.h> #include <stdlib.h> @@ -37,17 +32,11 @@ namespace Saga { -int -TRANSITION_Dissolve(byte * dst_img, - int dst_w, - int dst_h, - int dst_p, const byte * src_img, int src_p, int flags, double percent) -{ +int TRANSITION_Dissolve(byte *dst_img, int dst_w, int dst_h, int dst_p, const byte *src_img, + int src_p, int flags, double percent) { #define XOR_MASK 0xB400; - int pixelcount = dst_w * dst_h; int seqlimit = (int)(65535 * percent); - int seq = 1; int i; @@ -56,7 +45,6 @@ TRANSITION_Dissolve(byte * dst_img, YS_IGNORE_PARAM(dst_p); for (i = 0; i < seqlimit; i++) { - if (seq & 1) { seq = (seq >> 1) ^ XOR_MASK; } else { @@ -70,9 +58,7 @@ TRANSITION_Dissolve(byte * dst_img, if (seq >= pixelcount) { continue; } else { - dst_img[seq] = src_img[seq]; - } } |