[Scummvm-cvs-logs] SF.net SVN: scummvm: [29841] scummvm/trunk/engines/cine

[thebluegr at users.sourceforge.net]

Revision: 29841
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29841&view=rev
Author:   thebluegr
Date:     2007-12-13 02:06:53 -0800 (Thu, 13 Dec 2007)

Log Message:
-----------
Changed the C style malloc/free to the C++ style new/delete

Modified Paths:
--------------
    scummvm/trunk/engines/cine/bg_list.cpp
    scummvm/trunk/engines/cine/object.cpp
    scummvm/trunk/engines/cine/prc.cpp
    scummvm/trunk/engines/cine/rel.cpp
    scummvm/trunk/engines/cine/script.cpp
    scummvm/trunk/engines/cine/various.cpp

Modified: scummvm/trunk/engines/cine/bg_list.cpp
===================================================================
--- scummvm/trunk/engines/cine/bg_list.cpp	2007-12-12 22:11:19 UTC (rev 29840)
+++ scummvm/trunk/engines/cine/bg_list.cpp	2007-12-13 10:06:53 UTC (rev 29841)
@@ -93,7 +93,7 @@
 		bgIncrustPtr = bgIncrustPtr->next;
 	}
 
-	bgIncrustPtr = (BGIncrustList *)malloc(sizeof(BGIncrustList));
+	bgIncrustPtr = new BGIncrustList;
 	if (bgIncrustPtrP)
 		bgIncrustPtrP->next = bgIncrustPtr;
 	else
@@ -115,7 +115,7 @@
 
 	while (bgIncrustPtr) {
 		bgIncrustPtrN = bgIncrustPtr->next;
-		free(bgIncrustPtr);
+		delete bgIncrustPtr;
 		bgIncrustPtr = bgIncrustPtrN;
 	}
 
@@ -137,7 +137,7 @@
 		bgIncrustPtr = bgIncrustPtr->next;
 	}
 
-	bgIncrustPtr = (BGIncrustList *)malloc(sizeof(BGIncrustList));
+	bgIncrustPtr = new BGIncrustList;
 	if (bgIncrustPtrP)
 		bgIncrustPtrP->next = bgIncrustPtr;
 	else

Modified: scummvm/trunk/engines/cine/object.cpp
===================================================================
--- scummvm/trunk/engines/cine/object.cpp	2007-12-12 22:11:19 UTC (rev 29840)
+++ scummvm/trunk/engines/cine/object.cpp	2007-12-13 10:06:53 UTC (rev 29841)
@@ -183,7 +183,7 @@
 		currentHeadPtr = tempHead->next;
 	}
 
-	pNewElement = (overlayHeadElement *)malloc(sizeof(overlayHeadElement));
+	pNewElement = new overlayHeadElement;
 
 	assert(pNewElement);
 

Modified: scummvm/trunk/engines/cine/prc.cpp
===================================================================
--- scummvm/trunk/engines/cine/prc.cpp	2007-12-12 22:11:19 UTC (rev 29840)
+++ scummvm/trunk/engines/cine/prc.cpp	2007-12-13 10:06:53 UTC (rev 29841)
@@ -53,7 +53,7 @@
 
 		temp = currentHead->next;
 
-		free(currentHead);
+		delete currentHead;
 
 		currentHead = temp;
 	}

Modified: scummvm/trunk/engines/cine/rel.cpp
===================================================================
--- scummvm/trunk/engines/cine/rel.cpp	2007-12-12 22:11:19 UTC (rev 29840)
+++ scummvm/trunk/engines/cine/rel.cpp	2007-12-13 10:06:53 UTC (rev 29841)
@@ -48,7 +48,7 @@
 
 		temp = currentHead->next;
 
-		free(currentHead);
+		delete currentHead;
 
 		currentHead = temp;
 	}

Modified: scummvm/trunk/engines/cine/script.cpp
===================================================================
--- scummvm/trunk/engines/cine/script.cpp	2007-12-12 22:11:19 UTC (rev 29840)
+++ scummvm/trunk/engines/cine/script.cpp	2007-12-13 10:06:53 UTC (rev 29841)
@@ -474,7 +474,7 @@
 	if (currentHead && currentHead->objIdx == param1 && currentHead->type == 20 && currentHead->x == param2)
 		return;
 
-	newElement = (overlayHeadElement *)malloc(sizeof(overlayHeadElement));
+	newElement = new overlayHeadElement;
 
 	newElement->next = tempHead->next;
 	tempHead->next = newElement;
@@ -652,7 +652,7 @@
 		currentHead = tempHead->next;
 	}
 
-	pNewElement =(prcLinkedListStruct *)malloc(sizeof(prcLinkedListStruct));
+	pNewElement = new prcLinkedListStruct;
 
 	assert(pNewElement);
 

Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp	2007-12-12 22:11:19 UTC (rev 29840)
+++ scummvm/trunk/engines/cine/various.cpp	2007-12-13 10:06:53 UTC (rev 29841)
@@ -162,7 +162,7 @@
 		currentHead = tempHead->next;
 	}
 
-	pNewElement = (prcLinkedListStruct *)malloc(sizeof(prcLinkedListStruct));
+	pNewElement = new prcLinkedListStruct;
 
 	assert(pNewElement);
 
@@ -202,7 +202,7 @@
 		currentHeadPtr = tempHead->next;
 	}
 
-	pNewElement = (overlayHeadElement *)malloc(sizeof(overlayHeadElement));
+	pNewElement = new overlayHeadElement;
 
 	assert(pNewElement);
 
@@ -324,8 +324,7 @@
 		currentHead = tempHead->next;
 	}
 
-	newElement =
-	    (prcLinkedListStruct *)malloc(sizeof(prcLinkedListStruct));
+	newElement = new prcLinkedListStruct;
 
 	newElement->next = tempHead->next;
 	tempHead->next = newElement;
@@ -357,7 +356,7 @@
 		currentHead = tempHead->next;
 	}
 
-	newElement = (prcLinkedListStruct *)malloc(sizeof(prcLinkedListStruct));
+	newElement = new prcLinkedListStruct;
 
 	newElement->next = tempHead->next;
 	tempHead->next = newElement;
@@ -387,7 +386,7 @@
 		currentHead = tempHead->next;
 	}
 
-	newElement = (overlayHeadElement *)malloc(sizeof(overlayHeadElement));
+	newElement = new overlayHeadElement;
 
 	fHandle->readUint32BE();
 	fHandle->readUint32BE();
@@ -2321,7 +2320,7 @@
 		currentHead = tempHead->next;
 	}
 
-	newElement = (overlayHeadElement *)malloc(sizeof(overlayHeadElement));
+	newElement = new overlayHeadElement;
 
 	newElement->next = tempHead->next;
 	tempHead->next = newElement;
@@ -2356,7 +2355,7 @@
 		currentHead = tempHead->next;
 	}
 
-	newElement = (SeqListElement *)malloc(sizeof(SeqListElement));
+	newElement = new SeqListElement;
 
 	newElement->next = tempHead->next;
 	tempHead->next = newElement;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.