diff options
author | Paul Gilbert | 2011-08-06 13:30:36 +1000 |
---|---|---|
committer | Paul Gilbert | 2011-08-06 13:30:36 +1000 |
commit | 0cb8b15cdf3eafbfea33ab68c6f3d43e42f11e80 (patch) | |
tree | 78feed8d45a971559f7ed6a1961d4f6bc8c12d9e | |
parent | 388dadd56f0b0f35e0b617d1a8ce9ab47a0c14fc (diff) | |
download | scummvm-rg350-0cb8b15cdf3eafbfea33ab68c6f3d43e42f11e80.tar.gz scummvm-rg350-0cb8b15cdf3eafbfea33ab68c6f3d43e42f11e80.tar.bz2 scummvm-rg350-0cb8b15cdf3eafbfea33ab68c6f3d43e42f11e80.zip |
CGE: Fixed warning of shadowed variable
-rw-r--r-- | engines/cge/vga13h.cpp | 8 | ||||
-rw-r--r-- | engines/cge/vga13h.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp index f34211c360..d2ba9b1b99 100644 --- a/engines/cge/vga13h.cpp +++ b/engines/cge/vga13h.cpp @@ -337,16 +337,16 @@ Snail::Com *Sprite::snList(SnList type) { } -void Sprite::setName(char *name) { +void Sprite::setName(char *newName) { if (_ext) { if (_ext->_name) { delete[] _ext->_name; _ext->_name = NULL; } - if (name) { - _ext->_name = new char[strlen(name) + 1]; + if (newName) { + _ext->_name = new char[strlen(newName) + 1]; assert(_ext->_name != NULL); - strcpy(_ext->_name, name); + strcpy(_ext->_name, newName); } } } diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h index f72d4c693d..db75b48692 100644 --- a/engines/cge/vga13h.h +++ b/engines/cge/vga13h.h @@ -187,7 +187,7 @@ public: Sprite *expand(); Sprite *contract(); Sprite *backShow(bool fast = false); - void setName(char *name); + void setName(char *newName); inline char *name() { return (_ext) ? _ext->_name : NULL; } |