[SCM] game about viruses invading your computer branch, master, updated. debian/1.0-1.dfsg.1-2-14-g1580490

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit b65eca9b7daa213a7075ee55ce782e64937a3ba6
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Wed Jan 4 13:20:27 2012 -0500

    refreshed debian/patches/0010-mismatched-delete.patch

diff --git a/debian/patches/0010-mismatched-delete.patch b/debian/patches/0010-mismatched-delete.patch
index 43e84fa..48c63d9 100644
--- a/debian/patches/0010-mismatched-delete.patch
+++ b/debian/patches/0010-mismatched-delete.patch
@@ -3,7 +3,7 @@ Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
 
 --- a/src/CEngine.cpp
 +++ b/src/CEngine.cpp
-@@ -68,9 +68,9 @@
+@@ -64,9 +64,9 @@
  	deleteWidgets();
  
  	debug(("engine: free databuffer\n"));
@@ -15,7 +15,7 @@ Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
  
  	debug(("Clearing Define List...\n"));
  	defineList.clear();
-@@ -268,16 +268,12 @@
+@@ -264,16 +264,12 @@
  {
  	if (fileType == PAK_DATA)
  	{
@@ -34,9 +34,9 @@ Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
  		binaryBuffer = NULL;
  	}
  
-@@ -340,14 +336,11 @@
+@@ -336,15 +332,12 @@
  
- bool Engine::loadData(char *filename)
+ bool Engine::loadData(const char *filename)
  {
 -	if (dataBuffer != NULL)
 -	{
@@ -45,10 +45,13 @@ Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
 -	}
 +	delete[] dataBuffer;
 +	dataBuffer = NULL;
- 	
- 	#if USEPAK
+ 
+-	#if USEPAK
 -		return unpack(filename, PAK_DATA);
+-	#endif
++#if USEPAK
 +	return unpack(filename, PAK_DATA);
- 	#endif
++#endif
  
  	FILE *fp;
+ 	fp = fopen(filename, "rb");

-- 
game about viruses invading your computer