diff options
| author | Strangerke | 2014-06-06 23:18:01 +0200 |
|---|---|---|
| committer | Strangerke | 2014-06-06 23:18:01 +0200 |
| commit | 3dcfa95b44ec47c6eff1de03f946e2ac20bed29e (patch) | |
| tree | 89118fd00f572e59656468a89682bc77e174ec13 /devtools | |
| parent | 8cb50b52e0e6614343419ca75803c8a18cf085df (diff) | |
| parent | 113a2824c41283facd7ae6c24be3f74213207bc9 (diff) | |
| download | scummvm-rg350-3dcfa95b44ec47c6eff1de03f946e2ac20bed29e.tar.gz scummvm-rg350-3dcfa95b44ec47c6eff1de03f946e2ac20bed29e.tar.bz2 scummvm-rg350-3dcfa95b44ec47c6eff1de03f946e2ac20bed29e.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/create_neverhood/create_neverhood.cpp | 11 | ||||
| -rw-r--r-- | devtools/create_neverhood/tables.h | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/devtools/create_neverhood/create_neverhood.cpp b/devtools/create_neverhood/create_neverhood.cpp index a1201cdaa3..fb2912f722 100644 --- a/devtools/create_neverhood/create_neverhood.cpp +++ b/devtools/create_neverhood/create_neverhood.cpp @@ -467,7 +467,15 @@ public: std::vector<LISTCLASS*> lists; void add(LISTCLASS *list) { - lists.push_back(list); + bool doAppend = true; + for (typename std::vector<LISTCLASS*>::iterator it = lists.begin(); it != lists.end(); it++) { + if ((*it)->id == list->id) { + doAppend = false; + break; + } + } + if (doAppend) + lists.push_back(list); } void loadListVector(const uint32 *offsets) { @@ -475,7 +483,6 @@ public: LISTCLASS *list = new LISTCLASS(); list->loadList(offsets[i], offsets[i + 1]); bool doAppend = true; - // Bad for (typename std::vector<LISTCLASS*>::iterator it = lists.begin(); it != lists.end(); it++) { if ((*it)->id == list->id) { doAppend = false; diff --git a/devtools/create_neverhood/tables.h b/devtools/create_neverhood/tables.h index cea962d4c1..edcecc5d8d 100644 --- a/devtools/create_neverhood/tables.h +++ b/devtools/create_neverhood/tables.h @@ -45,7 +45,6 @@ static const uint32 rectListOffsets[] = { // Scene1002 3, 0x004B43A0, 1, 0x004B4418, - 3, 0x004B43A0, // Scene1004 1, 0x004B7C70, // Scene1109 |