[Scummvm-cvs-logs] CVS: scummvm/sword2 maketext.cpp,1.36,1.37 memory.cpp,1.21,1.22 resman.cpp,1.85,1.86 router.cpp,1.38,1.39 save_rest.cpp,1.46,1.47

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Jan 18 12:58:03 CET 2004


Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv23679

Modified Files:
	maketext.cpp memory.cpp resman.cpp router.cpp save_rest.cpp 
Log Message:
fix warnings

Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/maketext.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- maketext.cpp	6 Jan 2004 13:44:17 -0000	1.36
+++ maketext.cpp	18 Jan 2004 20:57:46 -0000	1.37
@@ -84,7 +84,7 @@
 
 	// allocate memory for array of lineInfo structures
 
-	line = _vm->_memory->allocMemory(MAX_LINES * sizeof(LineInfo), MEM_locked, UID_temp);
+	line = _vm->_memory->allocMemory(MAX_LINES * sizeof(LineInfo), MEM_locked, (uint32)UID_temp);
 
 	// get details of sentence breakdown into array of LineInfo structures
 	// and get the no of lines involved
@@ -210,7 +210,7 @@
 
 	// allocate memory for sprite, and lock it ready for use
 	// NB. 'textSprite' is the given pointer to the handle to be used
-	textSprite = _vm->_memory->allocMemory(sizeof(FrameHeader) + sizeOfSprite, MEM_locked, UID_text_sprite);
+	textSprite = _vm->_memory->allocMemory(sizeof(FrameHeader) + sizeOfSprite, MEM_locked, (uint32)UID_text_sprite);
 
 	// the handle (*textSprite) now points to UNMOVABLE memory block
 	// set up the frame header

Index: memory.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/memory.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- memory.cpp	6 Jan 2004 13:44:17 -0000	1.21
+++ memory.cpp	18 Jan 2004 20:57:46 -0000	1.22
@@ -72,7 +72,7 @@
 	_memList[0].size = _totalFreeMemory;
 	_memList[0].parent = -1;		// we are base - for now
 	_memList[0].child = -1;			// we are the end as well
-	_memList[0].uid = UID_memman;		// init id
+	_memList[0].uid = (uint32)UID_memman;		// init id
 
 	_baseMemBlock = 0;			// for now
 }
@@ -205,7 +205,7 @@
 	}
 
 	_memList[spawn].state = MEM_free;	// new block is free
-	_memList[spawn].uid = UID_memman;	// a memman created bloc
+	_memList[spawn].uid = (uint32)UID_memman;	// a memman created bloc
 
 	// size of the existing parent free block minus the size of the new
 	// space Talloc'ed.
@@ -252,7 +252,7 @@
 	// once you've done this the memory may be recycled
 
 	block->state = MEM_free;
-	block->uid = UID_memman;	// belongs to the memory manager again
+	block->uid = (uint32)UID_memman;	// belongs to the memory manager again
 
 #ifdef	MEMDEBUG
 	debugMemory();

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- resman.cpp	12 Jan 2004 20:04:22 -0000	1.85
+++ resman.cpp	18 Jan 2004 20:57:46 -0000	1.86
@@ -82,7 +82,7 @@
 	end = file.size();
 
 	//get some space for the incoming resource file - soon to be trashed
-	temp = _vm->_memory->allocMemory(end, MEM_locked, UID_temp);
+	temp = _vm->_memory->allocMemory(end, MEM_locked, (uint32)UID_temp);
 
 	if (file.read(temp->ad, end) != end) {
 		file.close();

Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/router.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- router.cpp	6 Jan 2004 13:44:17 -0000	1.38
+++ router.cpp	18 Jan 2004 20:57:46 -0000	1.39
@@ -106,7 +106,7 @@
 	if (_routeSlots[slotNo])
 		freeRouteMem();
 
-	_routeSlots[slotNo] = _vm->_memory->allocMemory(sizeof(WalkData) * O_WALKANIM_SIZE, MEM_locked, UID_walk_anim);
+	_routeSlots[slotNo] = _vm->_memory->allocMemory(sizeof(WalkData) * O_WALKANIM_SIZE, MEM_locked, (uint32)UID_walk_anim);
 
 	// 12000 bytes were used for this in Sword1 mega compacts, based on
 	// 20 bytes per 'WalkData' frame

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- save_rest.cpp	6 Jan 2004 13:44:17 -0000	1.46
+++ save_rest.cpp	18 Jan 2004 20:57:46 -0000	1.47
@@ -94,7 +94,7 @@
 	// allocate the savegame buffer
 
 	bufferSize = findBufferSize();
-	saveBufferMem = _memory->allocMemory(bufferSize, MEM_locked, UID_savegame_buffer);
+	saveBufferMem = _memory->allocMemory(bufferSize, MEM_locked, (uint32)UID_savegame_buffer);
 
 	fillSaveBuffer(saveBufferMem, bufferSize, desc);
 
@@ -224,7 +224,7 @@
 	// allocate the savegame buffer
 
 	bufferSize = findBufferSize();
-	saveBufferMem = _memory->allocMemory(bufferSize, MEM_locked, UID_savegame_buffer);
+	saveBufferMem = _memory->allocMemory(bufferSize, MEM_locked, (uint32)UID_savegame_buffer);
 
 	// read the savegame file into our buffer
 





More information about the Scummvm-git-logs mailing list