[Scummvm-cvs-logs] CVS: residual engine.cpp,1.76,1.77 engine.h,1.27,1.28 lua.cpp,1.137,1.138 objectstate.cpp,1.8,1.9 resource.cpp,1.23,1.24 textobject.cpp,1.25,1.26

[Gregory Montoir]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12312/residual

Modified Files:
	engine.cpp engine.h lua.cpp objectstate.cpp resource.cpp 
	textobject.cpp 
Log Message:
fixed some warnings and compilation under mingw :
- replaced _MSC_VER by _WIN32 define
- removed search.h include (not available here and tsearch() doesn't seem to be used anyway)


Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- engine.cpp	8 Apr 2005 17:32:01 -0000	1.76
+++ engine.cpp	8 Apr 2005 22:29:05 -0000	1.77
@@ -36,7 +36,7 @@
 extern Imuse *g_imuse;
 int g_imuseState = -1;
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 WIN32_FIND_DATAA g_find_file_data;
 HANDLE g_searchFile;

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- engine.h	8 Apr 2005 17:32:02 -0000	1.27
+++ engine.h	8 Apr 2005 22:29:05 -0000	1.28
@@ -206,7 +206,7 @@
 
 extern Actor *g_currentUpdatedActor;
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 extern WIN32_FIND_DATAA g_find_file_data;
 extern HANDLE g_searchFile;

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- lua.cpp	8 Apr 2005 18:29:13 -0000	1.137
+++ lua.cpp	8 Apr 2005 22:29:05 -0000	1.138
@@ -1242,7 +1242,7 @@
 
 static void FileFindDispose() {
 	if (g_searchFile) {
-#ifdef _MSC_VER
+#ifdef _WIN32
 		FindClose(g_searchFile);
 #else
 		closedir(g_searchFile);
@@ -1253,12 +1253,12 @@
 
 static void luaFileFindNext() {
 	bool found = false;
-#ifndef _MSC_VER
+#ifndef _WIN32
 	dirent *de;
 #endif
 
 	if (g_searchFile) {
-#ifdef _MSC_VER
+#ifdef _WIN32
 		if (g_firstFind) {
 			found = true;
 			g_firstFind = false;
@@ -1275,7 +1275,7 @@
 		} while (de && (de->d_type == 6/* DT_DIR ? */));
 #endif
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 		if (g_find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
 #else
 		if (de->d_type == 6/* DT_DIR ? */)
@@ -1285,7 +1285,7 @@
 	}
 
 	if (found) {
-#ifdef _MSC_VER
+#ifdef _WIN32
 		lua_pushstring(g_find_file_data.cFileName);
 #else
 		lua_pushstring(de->d_name);
@@ -1308,7 +1308,7 @@
 		sprintf(path, "%s", extension);
 	}
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 	std::string dir_strWin32 = path;
 	g_searchFile = FindFirstFile(dir_strWin32.c_str(), &g_find_file_data);
 	g_firstFind = true;

Index: objectstate.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/objectstate.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- objectstate.cpp	8 Apr 2005 12:09:17 -0000	1.8
+++ objectstate.cpp	8 Apr 2005 22:29:06 -0000	1.9
@@ -35,4 +35,4 @@
 	g_resourceloader->uncache(_bitmap->getFilename());
 	if (_zbitmap)
 		g_resourceloader->uncache(_zbitmap->getFilename());
-}
\ No newline at end of file
+}

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/resource.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- resource.cpp	18 Mar 2005 19:54:40 -0000	1.23
+++ resource.cpp	8 Apr 2005 22:29:06 -0000	1.24
@@ -45,7 +45,7 @@
 	dir_str += '/';
 	int lab_counter = 0;
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 	WIN32_FIND_DATAA find_file_data;
 	std::string dir_strWin32 = dir_str + '*';
 	HANDLE d = FindFirstFile(dir_strWin32.c_str(), &find_file_data);
@@ -59,7 +59,7 @@
 	if (d == NULL)
 		error("Cannot open DataDir (%s)- check configuration file", dir_str.c_str());
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 	do {
 		int namelen = strlen(find_file_data.cFileName);
 		if ((namelen > 4) && (stricmp(find_file_data.cFileName + namelen - 4, ".lab") == 0)) {
@@ -74,7 +74,7 @@
 			else
 				delete l;
 		}
-	} while (FindNextFile(d, &find_file_data) != NULL);
+	} while (FindNextFile(d, &find_file_data));
 	FindClose(d);
 #else
 	dirent *de;

Index: textobject.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/textobject.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- textobject.cpp	5 Apr 2005 13:50:53 -0000	1.25
+++ textobject.cpp	8 Apr 2005 22:29:06 -0000	1.26
@@ -30,7 +30,7 @@
 TextObject::TextObject() :
 		_created(false), _x(0), _y(0), _width(0), _height(0), _justify(0),
 		_font(NULL), _textBitmap(NULL), _bitmapWidth(0),
-		_bitmapHeight(0), _textObjectHandle(NULL), _disabled(0) {
+		_bitmapHeight(0), _disabled(false), _textObjectHandle(NULL) {
 	memset(_textID, 0, sizeof(_textID));
 	_fgColor._vals[0] = 0;
 	_fgColor._vals[1] = 0;