merged trunk into branch, reverted Cruise Singleton changes

svn-id: r51961

1 files changed, 10 insertions, 7 deletions

diff --git a/backends/platform/ds/arm9/source/zipreader.cpp b/backends/platform/ds/arm9/source/zipreader.cpp
index fd6da4e9b9..d4f055ee82 100644
--- a/backends/platform/ds/arm9/source/zipreader.cpp
+++ b/backends/platform/ds/arm9/source/zipreader.cpp
@@ -8,19 +8,23 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
  *
  */
 
 
+#include "common/scummsys.h"
 #include "zipreader.h"
 
 ZipFile::ZipFile() {
@@ -28,7 +32,7 @@ ZipFile::ZipFile() {
 
 //	consolePrintf("ZIP file check...");
 
-	char* p = (char *) ZF_SEARCH_START;
+	char *p = (char *) ZF_SEARCH_START;
 	bool found = false;
 
 	_zipFile = NULL;
@@ -75,7 +79,6 @@ bool ZipFile::restartFile() {
 	bool more = true;
 
 	while (!currentFileInFolder() && more) {
-		char name[128];
 		getFileName(name);
 		more = skipFile();
 	}
@@ -112,7 +115,7 @@ bool ZipFile::currentFileInFolder() {
 	return false;
 }
 
-void ZipFile::getFileName(char* name) {
+void ZipFile::getFileName(char *name) {
 	strncpy(name, (char *) (_currentFile + 1), _currentFile->nameLength);
 
 	for (int r = 0; name[r] != 0; r++) {
@@ -207,7 +210,7 @@ void ZipFile::changeToRoot() {
 	_directory[0] = 0;
 }
 
-void ZipFile::changeDirectory(const char* dir) {
+void ZipFile::changeDirectory(const char *dir) {
 //	consolePrintf("Current dir now '%s'\n", dir);
 
 	assert(dir && *dir);