[Scummvm-cvs-logs] scummvm master -> c239b868da4786f17e5e50ed16fe43bd7b7634a7

somaen einarjohants at gmail.com
Thu Jan 24 20:18:06 CET 2013


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

Summary:
c239b868da WINTERMUTE: More formatting fixes.


Commit: c239b868da4786f17e5e50ed16fe43bd7b7634a7
    https://github.com/scummvm/scummvm/commit/c239b868da4786f17e5e50ed16fe43bd7b7634a7
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-24T11:17:17-08:00

Commit Message:
WINTERMUTE: More formatting fixes.

Changed paths:
    engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
    engines/wintermute/persistent.h



diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
index d1a7546..42c5cfb 100644
--- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
@@ -481,10 +481,10 @@ bool SXMemBuffer::scSetProperty(const char *name, ScValue *value) {
 	    _length = max(value->getInt(0), 0);
 
 	    char propName[20];
-	    if (_length < OrigLength) {
-	        for(int i=_length; i<OrigLength; i++) {
-	            sprintf(PropName, "%d", i);
-	            _values->DeleteProp(PropName);
+	    if (_length < origLength) {
+	        for(int i=_length; i < origLength; i++) {
+	            sprintf(propName, "%d", i);
+	            _values->DeleteProp(propName);
 	        }
 	    }
 	    return STATUS_OK;
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index d768f44..ed43f5f 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -70,13 +70,13 @@ namespace Wintermute {
 	\
 	/*SystemClass Register##class_name(class_name::_className, class_name::PersistBuild, class_name::PersistLoad, persistent_class);*/\
 	\
-	void* className::operator new (size_t size) {\
+	void* className::operator new(size_t size) {\
 		void* ret = ::operator new(size);\
 		SystemClassRegistry::getInstance()->registerInstance(#className, ret);\
 		return ret;\
 	}\
 	\
-	void className::operator delete (void *p) {\
+	void className::operator delete(void *p) {\
 		SystemClassRegistry::getInstance()->unregisterInstance(#className, p);\
 		::operator delete(p);\
 	}\






More information about the Scummvm-git-logs mailing list