aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2006-07-15 21:27:29 +0000
committerJohannes Schickel2006-07-15 21:27:29 +0000
commitdb58d3477b7b79774bc1fba3e19cec4080548978 (patch)
tree74bf4cb3279e562dcdb7a6bb6b7820267f9df97c /engines
parentb09b9b216ef298e39059181e3237cbba9979f03a (diff)
downloadscummvm-rg350-db58d3477b7b79774bc1fba3e19cec4080548978.tar.gz
scummvm-rg350-db58d3477b7b79774bc1fba3e19cec4080548978.tar.bz2
scummvm-rg350-db58d3477b7b79774bc1fba3e19cec4080548978.zip
Should fix shadowing warnings with gcc.
svn-id: r23520
Diffstat (limited to 'engines')
-rw-r--r--engines/sword2/animation.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index 0a937d48df..cda279e6ab 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -43,7 +43,7 @@ struct MovieTextObject {
};
struct MovieInfo {
- MovieInfo(const char *name, const uint frames, const bool seamless) : name(name), frames(frames), seamless(seamless) {}
+ MovieInfo(const char *name_, const uint frames_, const bool seamless_) : name(name_), frames(frames_), seamless(seamless_) {}
const char *name;
const uint frames;