diff options
| author | Einar Johan Trøan Sømåen | 2012-07-26 15:59:26 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-26 15:59:26 +0200 |
| commit | ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d (patch) | |
| tree | 8dfaee0ba16e18a8e3772dd5afc9123d5c4e78d2 /engines/wintermute/system | |
| parent | 38507fa9895620639d8733dbb4e085dfb2282a33 (diff) | |
| download | scummvm-rg350-ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d.tar.gz scummvm-rg350-ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d.tar.bz2 scummvm-rg350-ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d.zip | |
WINTERMUTE: Run Astyle with add-braces to break one-line statements into easier-to-read-code.
Diffstat (limited to 'engines/wintermute/system')
| -rw-r--r-- | engines/wintermute/system/sys_class.cpp | 19 | ||||
| -rw-r--r-- | engines/wintermute/system/sys_class_registry.cpp | 61 |
2 files changed, 59 insertions, 21 deletions
diff --git a/engines/wintermute/system/sys_class.cpp b/engines/wintermute/system/sys_class.cpp index 32704e0a0e..21578320c7 100644 --- a/engines/wintermute/system/sys_class.cpp +++ b/engines/wintermute/system/sys_class.cpp @@ -85,7 +85,9 @@ SystemInstance *SystemClass::addInstance(void *instance, int id, int savedId) { //////////////////////////////////////////////////////////////////////////
bool SystemClass::removeInstance(void *instance) {
InstanceMap::iterator mapIt = _instanceMap.find(instance);
- if (mapIt == _instanceMap.end()) return false;
+ if (mapIt == _instanceMap.end()) {
+ return false;
+ }
Instances::iterator it = _instances.find((mapIt->_value));
if (it != _instances.end()) {
@@ -101,8 +103,11 @@ bool SystemClass::removeInstance(void *instance) { //////////////////////////////////////////////////////////////////////////
int SystemClass::getInstanceID(void *pointer) {
InstanceMap::iterator mapIt = _instanceMap.find(pointer);
- if (mapIt == _instanceMap.end()) return -1;
- else return (mapIt->_value)->getID();
+ if (mapIt == _instanceMap.end()) {
+ return -1;
+ } else {
+ return (mapIt->_value)->getID();
+ }
}
//////////////////////////////////////////////////////////////////////////
@@ -110,7 +115,9 @@ void *SystemClass::idToPointer(int savedID) { //slow
Instances::iterator it;
for (it = _instances.begin(); it != _instances.end(); ++it) {
- if ((it->_value)->getSavedID() == savedID) return (it->_value)->getInstance();
+ if ((it->_value)->getSavedID() == savedID) {
+ return (it->_value)->getInstance();
+ }
}
return NULL;
}
@@ -157,7 +164,9 @@ void SystemClass::loadTable(BaseGame *gameRef, BasePersistenceManager *persistMg if (it != _instances.end()) {
(it->_value)->setSavedID(instID);
SystemClassRegistry::getInstance()->addInstanceToTable((it->_value), (it->_value)->getInstance());
- } else gameRef->LOG(0, "Warning: instance %d of persistent class %s not found", i, _name.c_str());
+ } else {
+ gameRef->LOG(0, "Warning: instance %d of persistent class %s not found", i, _name.c_str());
+ }
}
// normal instances, create empty objects
else {
diff --git a/engines/wintermute/system/sys_class_registry.cpp b/engines/wintermute/system/sys_class_registry.cpp index 7f7814f75c..47910af4e8 100644 --- a/engines/wintermute/system/sys_class_registry.cpp +++ b/engines/wintermute/system/sys_class_registry.cpp @@ -77,7 +77,9 @@ bool SystemClassRegistry::registerClass(SystemClass *classObj) { bool SystemClassRegistry::unregisterClass(SystemClass *classObj) {
Classes::iterator it = _classes.find(classObj);
- if (it == _classes.end()) return false;
+ if (it == _classes.end()) {
+ return false;
+ }
if (classObj->getNumInstances() != 0) {
char str[MAX_PATH_LENGTH];
@@ -87,10 +89,14 @@ bool SystemClassRegistry::unregisterClass(SystemClass *classObj) { _classes.erase(it);
NameMap::iterator mapIt = _nameMap.find(classObj->getName());
- if (mapIt != _nameMap.end()) _nameMap.erase(mapIt);
+ if (mapIt != _nameMap.end()) {
+ _nameMap.erase(mapIt);
+ }
IdMap::iterator idIt = _idMap.find(classObj->getID());
- if (idIt != _idMap.end()) _idMap.erase(idIt);
+ if (idIt != _idMap.end()) {
+ _idMap.erase(idIt);
+ }
return true;
@@ -99,10 +105,14 @@ bool SystemClassRegistry::unregisterClass(SystemClass *classObj) { //////////////////////////////////////////////////////////////////////////
bool SystemClassRegistry::registerInstance(const char *className, void *instance) {
- if (_disabled) return true;
+ if (_disabled) {
+ return true;
+ }
NameMap::iterator mapIt = _nameMap.find(className);
- if (mapIt == _nameMap.end()) return false;
+ if (mapIt == _nameMap.end()) {
+ return false;
+ }
SystemInstance *inst = (*mapIt)._value->addInstance(instance, _count++);
return (inst != NULL);
@@ -112,8 +122,9 @@ bool SystemClassRegistry::registerInstance(const char *className, void *instance void SystemClassRegistry::addInstanceToTable(SystemInstance *instance, void *pointer) {
_instanceMap[pointer] = instance;
- if (instance->getSavedID() >= 0)
+ if (instance->getSavedID() >= 0) {
_savedInstanceMap[instance->getSavedID()] = instance;
+ }
}
//////////////////////////////////////////////////////////////////////////
@@ -124,23 +135,31 @@ int SystemClassRegistry::getNextID() { //////////////////////////////////////////////////////////////////////////
bool SystemClassRegistry::unregisterInstance(const char *className, void *instance) {
NameMap::iterator mapIt = _nameMap.find(className);
- if (mapIt == _nameMap.end()) return false;
+ if (mapIt == _nameMap.end()) {
+ return false;
+ }
(*mapIt)._value->removeInstance(instance);
InstanceMap::iterator instIt = _instanceMap.find(instance);
if (instIt != _instanceMap.end()) {
_instanceMap.erase(instIt);
return true;
- } else return false;
+ } else {
+ return false;
+ }
}
//////////////////////////////////////////////////////////////////////////
bool SystemClassRegistry::getPointerID(void *pointer, int *classID, int *instanceID) {
- if (pointer == NULL) return true;
+ if (pointer == NULL) {
+ return true;
+ }
InstanceMap::iterator it = _instanceMap.find(pointer);
- if (it == _instanceMap.end()) return false;
+ if (it == _instanceMap.end()) {
+ return false;
+ }
SystemInstance *inst = (*it)._value;
@@ -153,8 +172,11 @@ bool SystemClassRegistry::getPointerID(void *pointer, int *classID, int *instanc //////////////////////////////////////////////////////////////////////////
void *SystemClassRegistry::idToPointer(int classID, int instanceID) {
SavedInstanceMap::iterator it = _savedInstanceMap.find(instanceID);
- if (it == _savedInstanceMap.end()) return NULL;
- else return (*it)._value->getInstance();
+ if (it == _savedInstanceMap.end()) {
+ return NULL;
+ } else {
+ return (*it)._value->getInstance();
+ }
}
bool checkHeader(const char *tag, BasePersistenceManager *pm) {
@@ -203,7 +225,9 @@ bool SystemClassRegistry::loadTable(BaseGame *gameRef, BasePersistenceManager *p }
for (it = _classes.begin(); it != _classes.end(); ++it) {
- if ((it->_value)->isPersistent()) continue;
+ if ((it->_value)->isPersistent()) {
+ continue;
+ }
(it->_value)->removeAllInstances();
}
@@ -218,7 +242,9 @@ bool SystemClassRegistry::loadTable(BaseGame *gameRef, BasePersistenceManager *p Common::String className = persistMgr->getStringObj();
NameMap::iterator mapIt = _nameMap.find(className);
- if (mapIt != _nameMap.end())(*mapIt)._value->loadTable(gameRef, persistMgr);
+ if (mapIt != _nameMap.end()) {
+ (*mapIt)._value->loadTable(gameRef, persistMgr);
+ }
}
checkHeader("</CLASS_REGISTRY_TABLE>", persistMgr);
@@ -298,7 +324,9 @@ bool SystemClassRegistry::loadInstances(BaseGame *gameRef, BasePersistenceManage //////////////////////////////////////////////////////////////////////////
bool SystemClassRegistry::enumInstances(SYS_INSTANCE_CALLBACK lpCallback, const char *className, void *lpData) {
NameMap::iterator mapIt = _nameMap.find(className);
- if (mapIt == _nameMap.end()) return STATUS_FAILED;
+ if (mapIt == _nameMap.end()) {
+ return STATUS_FAILED;
+ }
(*mapIt)._value->instanceCallback(lpCallback, lpData);
return STATUS_OK;
@@ -308,8 +336,9 @@ bool SystemClassRegistry::enumInstances(SYS_INSTANCE_CALLBACK lpCallback, const //////////////////////////////////////////////////////////////////////////
void SystemClassRegistry::dumpClasses(Common::WriteStream *stream) {
Classes::iterator it;
- for (it = _classes.begin(); it != _classes.end(); ++it)
+ for (it = _classes.begin(); it != _classes.end(); ++it) {
(it->_value)->dump(stream);
+ }
}
} // end of namespace WinterMute
|