[Scummvm-cvs-logs] SF.net SVN: scummvm:[43988] scummvm/trunk/engines/sci/engine

[fingolfin at users.sourceforge.net]

Revision: 43988
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43988&view=rev
Author:   fingolfin
Date:     2009-09-06 13:01:26 +0000 (Sun, 06 Sep 2009)

Log Message:
-----------
SCI: Rename SegManager::exports_wide to _exportsAreWide and changed it to a bool, and rename setExportWidth() to setExportAreWide()

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/game.cpp
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/sci/engine/seg_manager.cpp
    scummvm/trunk/engines/sci/engine/seg_manager.h

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2009-09-06 13:01:00 UTC (rev 43987)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2009-09-06 13:01:26 UTC (rev 43988)
@@ -359,9 +359,9 @@
 	s->have_bp = 0;
 
 	if (s->detectLofsType() == SCI_VERSION_1_MIDDLE)
-		s->segMan->setExportWidth(1);
+		s->segMan->setExportAreWide(true);
 	else
-		s->segMan->setExportWidth(0);
+		s->segMan->setExportAreWide(false);
 
 	debug(2, "Engine initialized");
 

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-09-06 13:01:00 UTC (rev 43987)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-09-06 13:01:26 UTC (rev 43988)
@@ -190,7 +190,7 @@
 
 void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
 	s.skip(4, VER(9), VER(9));	// Obsolete: Used to be reserved_id
-	s.syncAsSint32LE(exports_wide);
+	s.syncAsSint32LE(_exportsAreWide);
 	s.skip(4, VER(9), VER(9));	// Obsolete: Used to be gc_mark_bits
 
 	if (s.isLoading()) {

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2009-09-06 13:01:00 UTC (rev 43987)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2009-09-06 13:01:26 UTC (rev 43988)
@@ -58,7 +58,7 @@
 	Nodes_seg_id = 0;
 	Hunks_seg_id = 0;
 
-	exports_wide = 0;
+	_exportsAreWide = false;
 	_resMan = resMan;
 
 	int result = 0;
@@ -278,8 +278,8 @@
 	return getScriptIfLoaded(seg) != 0;
 }
 
-void SegManager::setExportWidth(int flag) {
-	exports_wide = flag;
+void SegManager::setExportAreWide(bool flag) {
+	_exportsAreWide = flag;
 }
 
 int SegManager::relocateBlock(Common::Array<reg_t> &block, int block_location, SegmentId segment, int location) {
@@ -732,7 +732,7 @@
 		return 0;
 	}
 
-	if (exports_wide)
+	if (_exportsAreWide)
 		pubfunct *= 2;
 	uint16 offset = READ_LE_UINT16((byte *)(scr->export_table + pubfunct));
 	VERIFY(offset < scr->buf_size, "invalid export function pointer");

Modified: scummvm/trunk/engines/sci/engine/seg_manager.h
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.h	2009-09-06 13:01:00 UTC (rev 43987)
+++ scummvm/trunk/engines/sci/engine/seg_manager.h	2009-09-06 13:01:26 UTC (rev 43988)
@@ -188,9 +188,9 @@
 
 	/**
 	 * Tells the segment manager whether exports are wide (32-bit) or not.
-	 * @param flag	1 if exports are wide, 0 otherwise
+	 * @param flag	true if exports are wide, false otherwise
 	 */
-	void setExportWidth(int flag);
+	void setExportAreWide(bool flag);
 
 	/**
 	 * Processes a relocation block witin a script
@@ -360,7 +360,7 @@
 
 public: // TODO: make private
 	Common::Array<MemObject *> _heap;
-	int exports_wide;
+	bool _exportsAreWide;
 	Common::Array<Class> _classtable; /**< Table of all classes */
 	ResourceManager *_resMan;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.