[Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.19,1.20 actionmap.h,1.8,1.9 scene.cpp,1.19,1.20

Joost Peters joostp at users.sourceforge.net
Sun Aug 1 15:53:05 CEST 2004


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

Modified Files:
	actionmap.cpp actionmap.h scene.cpp 
Log Message:
rename load() to loadMap()


Index: actionmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actionmap.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- actionmap.cpp	1 Aug 2004 13:34:19 -0000	1.19
+++ actionmap.cpp	1 Aug 2004 22:52:45 -0000	1.20
@@ -55,7 +55,7 @@
 }
 
 
-int ActionMap::load(const byte * exmap_res, size_t exmap_res_len) {
+int ActionMap::loadMap(const byte * exmap_res, size_t exmap_res_len) {
 	// Loads exit map data from specified exit map resource
 	R_ACTIONMAP_ENTRY *exmap_entry;
 	R_POINT *exmap_pt_tbl;

Index: actionmap.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actionmap.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- actionmap.h	1 Aug 2004 13:34:19 -0000	1.8
+++ actionmap.h	1 Aug 2004 22:52:45 -0000	1.9
@@ -44,7 +44,7 @@
 	ActionMap(SagaEngine *vm);
 	~ActionMap(void);
 
-	int load(const byte *exmap_res, size_t exmap_res_len);
+	int loadMap(const byte *exmap_res, size_t exmap_res_len);
 	int draw(R_SURFACE *ds, int color);
 
 	int freeMap(void);

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- scene.cpp	1 Aug 2004 22:48:40 -0000	1.19
+++ scene.cpp	1 Aug 2004 22:52:45 -0000	1.20
@@ -623,7 +623,7 @@
 			break;
 		case SAGA_ACTION_MAP:
 			debug(0, "Loading exit map resource...");
-			if (_vm->_actionMap->load(res_data, res_data_len) != R_SUCCESS) {
+			if (_vm->_actionMap->loadMap(res_data, res_data_len) != R_SUCCESS) {
 				warning("ProcessSceneResources: Error loading exit map resource");
 				return R_FAILURE;
 			}





More information about the Scummvm-git-logs mailing list