[Scummvm-cvs-logs] scummvm master -> 2507b5db8d2dbeef0f937d6d61a5ada1cac7e445

[somaen]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
487539f102 WINTERMUTE: Remove commented out code.
2507b5db8d WINTERMUTE: Fix formatting in persistent.h


Commit: 487539f1029061ac02c64f17b4f4b4ce033c6b41
    https://github.com/scummvm/scummvm/commit/487539f1029061ac02c64f17b4f4b4ce033c6b41
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-24T09:39:57-08:00

Commit Message:
WINTERMUTE: Remove commented out code.

Changed paths:
    engines/wintermute/base/scriptables/script_stack.cpp



diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp
index 7736704..194c5f4 100644
--- a/engines/wintermute/base/scriptables/script_stack.cpp
+++ b/engines/wintermute/base/scriptables/script_stack.cpp
@@ -147,73 +147,36 @@ void ScStack::correctParams(uint32 expectedParams) {
 
 //////////////////////////////////////////////////////////////////////////
 void ScStack::pushNULL() {
-	/*
-	ScValue* val = new ScValue(_gameRef);
-	val->setNULL();
-	Push(val);
-	delete val;
-	*/
 	getPushValue()->setNULL();
 }
 
 
 //////////////////////////////////////////////////////////////////////////
 void ScStack::pushInt(int val) {
-	/*
-	ScValue* val = new ScValue(_gameRef);
-	val->setInt(Val);
-	Push(val);
-	delete val;
-	*/
 	getPushValue()->setInt(val);
 }
 
 
 //////////////////////////////////////////////////////////////////////////
 void ScStack::pushFloat(double val) {
-	/*
-	ScValue* val = new ScValue(_gameRef);
-	val->setFloat(Val);
-	Push(val);
-	delete val;
-	*/
 	getPushValue()->setFloat(val);
 }
 
 
 //////////////////////////////////////////////////////////////////////////
 void ScStack::pushBool(bool val) {
-	/*
-	ScValue* val = new ScValue(_gameRef);
-	val->setBool(Val);
-	Push(val);
-	delete val;
-	*/
 	getPushValue()->setBool(val);
 }
 
 
 //////////////////////////////////////////////////////////////////////////
 void ScStack::pushString(const char *val) {
-	/*
-	ScValue* val = new ScValue(_gameRef);
-	val->setString(Val);
-	Push(val);
-	delete val;
-	*/
 	getPushValue()->setString(val);
 }
 
 
 //////////////////////////////////////////////////////////////////////////
 void ScStack::pushNative(BaseScriptable *val, bool persistent) {
-	/*
-	ScValue* val = new ScValue(_gameRef);
-	val->setNative(Val, Persistent);
-	Push(val);
-	delete val;
-	*/
-
 	getPushValue()->setNative(val, persistent);
 }
 


Commit: 2507b5db8d2dbeef0f937d6d61a5ada1cac7e445
    https://github.com/scummvm/scummvm/commit/2507b5db8d2dbeef0f937d6d61a5ada1cac7e445
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-24T09:46:32-08:00

Commit Message:
WINTERMUTE: Fix formatting in persistent.h

Changed paths:
    engines/wintermute/persistent.h



diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index c862df5..22acc0c 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -43,46 +43,46 @@ typedef void (*SYS_INSTANCE_CALLBACK)(void *Instance, void *Data);
 namespace Wintermute {
 
 
-#define DECLARE_PERSISTENT(class_name, parent_class)\
+#define DECLARE_PERSISTENT(className, parentClass)\
 	static const char _className[];\
-	static void* persistBuild(void);\
-	virtual const char* getClassName();\
+	static void *persistBuild(void);\
+	virtual const char *getClassName();\
 	static bool persistLoad(void* Instance, BasePersistenceManager* PersistMgr);\
-	class_name(TDynamicConstructor p1, TDynamicConstructor p2) :parent_class(p1, p2){ /*memset(this, 0, sizeof(class_name));*/ };\
-	virtual bool persist(BasePersistenceManager* PersistMgr);\
+	className(TDynamicConstructor p1, TDynamicConstructor p2) : parentClass(p1, p2) { /*memset(this, 0, sizeof(class_name));*/ };\
+	virtual bool persist(BasePersistenceManager *persistMgr);\
 	void* operator new (size_t size);\
 	void operator delete(void* p);\
 
 
-#define IMPLEMENT_PERSISTENT(class_name, persistent_class)\
-	const char class_name::_className[] = #class_name;\
-	void* class_name::persistBuild(){\
-		return ::new class_name(DYNAMIC_CONSTRUCTOR, DYNAMIC_CONSTRUCTOR);\
+#define IMPLEMENT_PERSISTENT(className, persistentClass)\
+	const char className::_className[] = #className;\
+	void* className::persistBuild(){\
+		return ::new className(DYNAMIC_CONSTRUCTOR, DYNAMIC_CONSTRUCTOR);\
 	}\
 	\
-	bool class_name::persistLoad(void* Instance, BasePersistenceManager* PersistMgr){\
-		return ((class_name*)Instance)->persist(PersistMgr);\
+	bool className::persistLoad(void *instance, BasePersistenceManager *persistMgr){\
+		return ((className*)instance)->persist(persistMgr);\
 	}\
 	\
-	const char* class_name::getClassName(){\
-		return #class_name;\
+	const char *className::getClassName(){\
+		return #className;\
 	}\
 	\
 	/*SystemClass Register##class_name(class_name::_className, class_name::PersistBuild, class_name::PersistLoad, persistent_class);*/\
 	\
-	void* class_name::operator new (size_t size){\
+	void* className::operator new (size_t size){\
 		void* ret = ::operator new(size);\
-		SystemClassRegistry::getInstance()->registerInstance(#class_name, ret);\
+		SystemClassRegistry::getInstance()->registerInstance(#className, ret);\
 		return ret;\
 	}\
 	\
-	void class_name::operator delete (void* p){\
-		SystemClassRegistry::getInstance()->unregisterInstance(#class_name, p);\
+	void className::operator delete (void *p){\
+		SystemClassRegistry::getInstance()->unregisterInstance(#className, p);\
 		::operator delete(p);\
 	}\
 
-#define TMEMBER(member_name) #member_name, &member_name
-#define TMEMBER_INT(member_name) #member_name, (int*)&member_name
+#define TMEMBER(memberName) #memberName, &memberName
+#define TMEMBER_INT(memberName) #memberName, (int*)&memberName
 
 } // end of namespace Wintermute