[Scummvm-cvs-logs] CVS: scummvm/saga scene.cpp,1.29,1.30 scene.h,1.7,1.8 sprite.cpp,1.18,1.19 xref.txt,1.2,1.3

Eugene Sandulenko sev at users.sourceforge.net
Wed Aug 11 11:13:48 CEST 2004


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

Modified Files:
	scene.cpp scene.h sprite.cpp xref.txt 
Log Message:
Fix scene description structure data types and rename it.


Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- scene.cpp	10 Aug 2004 19:20:33 -0000	1.29
+++ scene.cpp	11 Aug 2004 18:02:03 -0000	1.30
@@ -335,8 +335,8 @@
 int Scene::getZInfo(SCENE_ZINFO *zinfo) {
 	assert(_initialized);
 
-	zinfo->begin_slope = _desc.begin_slope;
-	zinfo->end_slope = _desc.end_slope;
+	zinfo->beginSlope = _desc.beginSlope;
+	zinfo->endSlope = _desc.endSlope;
 
 	return R_SUCCESS;
 }
@@ -436,11 +436,11 @@
 		break;
 	case BY_DESC:
 		assert(scene_desc_param != NULL);
-		assert(scene_desc_param->res_list != NULL);
+		assert(scene_desc_param->resList != NULL);
 		_loadDesc = false;
 		_desc = *scene_desc_param;
-		_resList = scene_desc_param->res_list;
-		_resListEntries = scene_desc_param->res_list_ct;
+		_resList = scene_desc_param->resList;
+		_resListEntries = scene_desc_param->resListCnt;
 		break;
 	default:
 		warning("Scene::loadScene(): Error: Invalid scene load flag");
@@ -460,7 +460,7 @@
 			return R_FAILURE;
 		}
 
-		if (loadSceneResourceList(_desc.res_list_rn) != R_SUCCESS) {
+		if (loadSceneResourceList(_desc.resListRN) != R_SUCCESS) {
 			warning("Scene::loadScene(): Error reading scene resource list");
 			return R_FAILURE;
 		}
@@ -485,8 +485,8 @@
 	}
 
 	// Load scene script data
-	if (_desc.script_num > 0) {
-		if (_vm->_script->loadScript(_desc.script_num) != R_SUCCESS) {
+	if (_desc.scriptNum > 0) {
+		if (_vm->_script->loadScript(_desc.scriptNum) != R_SUCCESS) {
 			warning("Scene::loadScene(): Error loading scene script");
 			return R_FAILURE;
 		}
@@ -525,14 +525,14 @@
 
 	MemoryReadStream readS(scene_desc_data, scene_desc_len);
 
-	_desc.unknown0 = readS.readUint16LE();
-	_desc.res_list_rn = readS.readUint16LE();
-	_desc.end_slope = readS.readUint16LE();
-	_desc.begin_slope = readS.readUint16LE();
-	_desc.script_num = readS.readUint16LE();
-	_desc.scene_scriptnum = readS.readUint16LE();
-	_desc.start_scriptnum = readS.readUint16LE();
-	_desc.music_rn = readS.readSint16LE();
+	_desc.flags = readS.readSint16LE();
+	_desc.resListRN = readS.readSint16LE();
+	_desc.endSlope = readS.readSint16LE();
+	_desc.beginSlope = readS.readSint16LE();
+	_desc.scriptNum = readS.readUint16LE();
+	_desc.sceneScriptNum = readS.readUint16LE();
+	_desc.startScriptNum = readS.readUint16LE();
+	_desc.musicRN = readS.readSint16LE();
 
 	RSC_FreeResource(scene_desc_data);
 
@@ -779,7 +779,7 @@
 
 	_sceneProc(SCENE_END, &scene_info);
 
-	if (_desc.script_num > 0) {
+	if (_desc.scriptNum > 0) {
 		_vm->_script->freeScript();
 	}
 
@@ -853,14 +853,14 @@
 	_vm->_console->print(fmt, "Scene number:", _sceneNumber);
 	_vm->_console->print(fmt, "Descriptor R#:", _sceneResNum);
 	_vm->_console->print("-------------------------");
-	_vm->_console->print(fmt, "Unknown:", _desc.unknown0);
-	_vm->_console->print(fmt, "Resource list R#:", _desc.res_list_rn);
-	_vm->_console->print(fmt, "End slope:", _desc.end_slope);
-	_vm->_console->print(fmt, "Begin slope:", _desc.begin_slope);
-	_vm->_console->print(fmt, "Script resource:", _desc.script_num);
-	_vm->_console->print(fmt, "Scene script:", _desc.scene_scriptnum);
-	_vm->_console->print(fmt, "Start script:", _desc.start_scriptnum);
-	_vm->_console->print(fmt, "Music R#", _desc.music_rn);
+	_vm->_console->print(fmt, "Flags:", _desc.flags);
+	_vm->_console->print(fmt, "Resource list R#:", _desc.resListRN);
+	_vm->_console->print(fmt, "End slope:", _desc.endSlope);
+	_vm->_console->print(fmt, "Begin slope:", _desc.beginSlope);
+	_vm->_console->print(fmt, "Script resource:", _desc.scriptNum);
+	_vm->_console->print(fmt, "Scene script:", _desc.sceneScriptNum);
+	_vm->_console->print(fmt, "Start script:", _desc.startScriptNum);
+	_vm->_console->print(fmt, "Music R#", _desc.musicRN);
 }
 
 static void CF_sceneinfo(int argc, char *argv[], void *refCon) {

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- scene.h	4 Aug 2004 20:28:57 -0000	1.7
+++ scene.h	11 Aug 2004 18:02:03 -0000	1.8
@@ -37,9 +37,8 @@
 };
 
 struct SCENE_ZINFO {
-	int begin_slope;
-	int end_slope;
-
+	int beginSlope;
+	int endSlope;
 };
 
 struct SCENE_BGINFO {
@@ -105,16 +104,16 @@
 #define SAGA_SCENE_DESC_LEN 16
 
 struct R_SCENE_DESC {
-	int unknown0;
-	int res_list_rn;
-	int end_slope;
-	int begin_slope;
-	int script_num;
-	int scene_scriptnum;
-	int start_scriptnum;
-	int music_rn;
-	R_SCENE_RESLIST *res_list;
-	size_t res_list_ct;
+	int16 flags;
+	int16 resListRN;
+	int16 endSlope;
+	int16 beginSlope;
+	uint16 scriptNum;
+	uint16 sceneScriptNum;
+	uint16 startScriptNum;
+	int16 musicRN;
+	R_SCENE_RESLIST *resList;
+	size_t resListCnt;
 };
 
 struct SCENE_IMAGE {

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sprite.cpp	4 Aug 2004 20:28:57 -0000	1.18
+++ sprite.cpp	11 Aug 2004 18:02:03 -0000	1.19
@@ -319,7 +319,7 @@
 	// Create actor Z occlusion LUT
 	_vm->_scene->getZInfo(&zinfo);
 
-	e_slope = zinfo.end_slope;
+	e_slope = zinfo.endSlope;
 
 	for (i = 0; i < R_SPRITE_ZMAX; i++) {
 		z_lut[i] = (int)(e_slope + ((137.0 - e_slope) / 14.0) * (15.0 - i));

Index: xref.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/xref.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xref.txt	10 Aug 2004 23:04:52 -0000	1.2
+++ xref.txt	11 Aug 2004 18:02:03 -0000	1.3
@@ -38,3 +38,11 @@
 Scene.c
 =======
  ResToImage()              _vm->decodeBGImage()
+ resInfo->sceneFlags       _desc.flags
+ resInfo->loadList         _desc.resListRN
+ resInfo->horizon          _desc.endSlope
+ resInfo->nearFigureLimit  _desc.beginSlope
+ resInfo->scriptModule     _desc.scriptNum
+ resInfo->entryScript      _desc.sceneScriptNum
+ resInfo->preScript        _desc.startScriptNum
+ resInfo->backgroundMusic  _desc.musicRN





More information about the Scummvm-git-logs mailing list