[Scummvm-cvs-logs] SF.net SVN: scummvm: [31959] scummvm/trunk/engines/parallaction

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Fri May 9 03:42:25 CEST 2008


Revision: 31959
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31959&view=rev
Author:   peres001
Date:     2008-05-08 18:42:25 -0700 (Thu, 08 May 2008)

Log Message:
-----------
Tiny cleanup to ease extraction of the program parser code.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/exec_br.cpp
    scummvm/trunk/engines/parallaction/exec_ns.cpp
    scummvm/trunk/engines/parallaction/objects.cpp
    scummvm/trunk/engines/parallaction/objects.h
    scummvm/trunk/engines/parallaction/parallaction.h

Modified: scummvm/trunk/engines/parallaction/exec_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_br.cpp	2008-05-09 01:35:43 UTC (rev 31958)
+++ scummvm/trunk/engines/parallaction/exec_br.cpp	2008-05-09 01:42:25 UTC (rev 31959)
@@ -399,7 +399,7 @@
 	}
 
 	if (inst->_opA._flags & kParaLocal) {
-		wrapLocalVar(inst->_opA._local);
+		inst->_opA._local->wrap();
 	}
 
 }

Modified: scummvm/trunk/engines/parallaction/exec_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_ns.cpp	2008-05-09 01:35:43 UTC (rev 31958)
+++ scummvm/trunk/engines/parallaction/exec_ns.cpp	2008-05-09 01:42:25 UTC (rev 31959)
@@ -107,7 +107,7 @@
 	}
 
 	if (inst->_opA._flags & kParaLocal) {
-		wrapLocalVar(inst->_opA._local);
+		inst->_opA._local->wrap();
 	}
 
 }
@@ -189,17 +189,7 @@
 
 
 
-void Parallaction_ns::wrapLocalVar(LocalVariable *local) {
 
-	if (local->_value >= local->_max)
-		local->_value = local->_min;
-	if (local->_value < local->_min)
-		local->_value = local->_max - 1;
-
-	return;
-}
-
-
 DECLARE_COMMAND_OPCODE(invalid) {
 	error("Can't execute invalid command '%i'", _cmdRunCtxt.cmd->_id);
 }

Modified: scummvm/trunk/engines/parallaction/objects.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/objects.cpp	2008-05-09 01:35:43 UTC (rev 31958)
+++ scummvm/trunk/engines/parallaction/objects.cpp	2008-05-09 01:42:25 UTC (rev 31959)
@@ -116,8 +116,18 @@
 	return _numLocals++;
 }
 
+void LocalVariable::wrap() {
 
+	if (_value >= _max)
+		_value = _min;
+	if (_value < _min)
+		_value = _max - 1;
 
+	return;
+}
+
+
+
 Zone::Zone() {
 	_left = _top = _right = _bottom = 0;
 

Modified: scummvm/trunk/engines/parallaction/objects.h
===================================================================
--- scummvm/trunk/engines/parallaction/objects.h	2008-05-09 01:35:43 UTC (rev 31958)
+++ scummvm/trunk/engines/parallaction/objects.h	2008-05-09 01:42:25 UTC (rev 31959)
@@ -316,6 +316,8 @@
 		_min = -10000;
 		_max = 10000;
 	}
+
+	void wrap();
 };
 
 enum ParaFlags {

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2008-05-09 01:35:43 UTC (rev 31958)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2008-05-09 01:42:25 UTC (rev 31959)
@@ -683,7 +683,6 @@
 	void		loadProgram(AnimationPtr a, const char *filename);
 	void		parseLValue(ScriptVar &var, const char *str);
 	virtual void	parseRValue(ScriptVar &var, const char *str);
-	void		wrapLocalVar(LocalVariable *local);
 
 	DECLARE_UNQUALIFIED_COMMAND_OPCODE(invalid);
 	DECLARE_UNQUALIFIED_COMMAND_OPCODE(set);


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




More information about the Scummvm-git-logs mailing list