[Scummvm-cvs-logs] scummvm master -> 22bcea1b31dc898f91844fdafb0ea647ac60c590

[johndoe123]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
59cd6d4b66 DEVTOOLS: Remove duplicate table entry in create_neverhood
9759b3481d DEVTOOLS: Skip adding duplicate items in create_neverhood
22bcea1b31 NEVERHOOD: Update neverhood.dat


Commit: 59cd6d4b6626f9f7a40a7c9b14a7ac18b2fb6f09
    https://github.com/scummvm/scummvm/commit/59cd6d4b6626f9f7a40a7c9b14a7ac18b2fb6f09
Author: johndoe123 (john_doe at techie.com)
Date: 2014-06-06T09:55:55+02:00

Commit Message:
DEVTOOLS: Remove duplicate table entry in create_neverhood

Changed paths:
    devtools/create_neverhood/tables.h



diff --git a/devtools/create_neverhood/tables.h b/devtools/create_neverhood/tables.h
index cea962d..edcecc5 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


Commit: 9759b3481d53a70bead5069ca3e2a2cc7b349416
    https://github.com/scummvm/scummvm/commit/9759b3481d53a70bead5069ca3e2a2cc7b349416
Author: johndoe123 (john_doe at techie.com)
Date: 2014-06-06T09:59:40+02:00

Commit Message:
DEVTOOLS: Skip adding duplicate items in create_neverhood

Some sub rectangles point to the same message list, these are now saved only once instead of several times.

Changed paths:
    devtools/create_neverhood/create_neverhood.cpp



diff --git a/devtools/create_neverhood/create_neverhood.cpp b/devtools/create_neverhood/create_neverhood.cpp
index a1201cd..fb2912f 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;


Commit: 22bcea1b31dc898f91844fdafb0ea647ac60c590
    https://github.com/scummvm/scummvm/commit/22bcea1b31dc898f91844fdafb0ea647ac60c590
Author: johndoe123 (john_doe at techie.com)
Date: 2014-06-06T10:00:27+02:00

Commit Message:
NEVERHOOD: Update neverhood.dat

Changed paths:
    dists/engine-data/neverhood.dat



diff --git a/dists/engine-data/neverhood.dat b/dists/engine-data/neverhood.dat
index dc95c00..2f1bc4b 100644
Binary files a/dists/engine-data/neverhood.dat and b/dists/engine-data/neverhood.dat differ