diff options
| author | Einar Johan Trøan Sømåen | 2012-07-09 03:27:21 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-09 03:27:21 +0200 |
| commit | 1eea9ad1a3ae577195363abe475cfbbee33d153b (patch) | |
| tree | 3df20e3a1443f12a39167f047bb49d4d8e57521b /engines/wintermute/Ad/AdInventory.cpp | |
| parent | 932bd45da5600c0a3f8b36d407fde38f60039432 (diff) | |
| download | scummvm-rg350-1eea9ad1a3ae577195363abe475cfbbee33d153b.tar.gz scummvm-rg350-1eea9ad1a3ae577195363abe475cfbbee33d153b.tar.bz2 scummvm-rg350-1eea9ad1a3ae577195363abe475cfbbee33d153b.zip | |
WINTERMUTE: Remove most of the wintype-definitions.
Diffstat (limited to 'engines/wintermute/Ad/AdInventory.cpp')
| -rw-r--r-- | engines/wintermute/Ad/AdInventory.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/wintermute/Ad/AdInventory.cpp b/engines/wintermute/Ad/AdInventory.cpp index 6260e23778..41e9a89ed5 100644 --- a/engines/wintermute/Ad/AdInventory.cpp +++ b/engines/wintermute/Ad/AdInventory.cpp @@ -49,11 +49,11 @@ CAdInventory::~CAdInventory() { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdInventory::insertItem(const char *name, const char *insertAfter) {
- if (name == NULL) return E_FAIL;
+ERRORCODE CAdInventory::insertItem(const char *name, const char *insertAfter) {
+ if (name == NULL) return STATUS_FAILED;
CAdItem *item = ((CAdGame *)Game)->getItemByName(name);
- if (item == NULL) return E_FAIL;
+ if (item == NULL) return STATUS_FAILED;
int insertIndex = -1;
for (int i = 0; i < _takenItems.GetSize(); i++) {
@@ -69,51 +69,51 @@ HRESULT CAdInventory::insertItem(const char *name, const char *insertAfter) { if (insertIndex == -1) _takenItems.Add(item);
else _takenItems.InsertAt(insertIndex, item);
- return S_OK;
+ return STATUS_OK;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdInventory::removeItem(const char *name) {
- if (name == NULL) return E_FAIL;
+ERRORCODE CAdInventory::removeItem(const char *name) {
+ if (name == NULL) return STATUS_FAILED;
for (int i = 0; i < _takenItems.GetSize(); i++) {
if (scumm_stricmp(_takenItems[i]->_name, name) == 0) {
if (((CAdGame *)Game)->_selectedItem == _takenItems[i])((CAdGame *)Game)->_selectedItem = NULL;
_takenItems.RemoveAt(i);
- return S_OK;
+ return STATUS_OK;
}
}
- return E_FAIL;
+ return STATUS_FAILED;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdInventory::removeItem(CAdItem *item) {
- if (item == NULL) return E_FAIL;
+ERRORCODE CAdInventory::removeItem(CAdItem *item) {
+ if (item == NULL) return STATUS_FAILED;
for (int i = 0; i < _takenItems.GetSize(); i++) {
if (_takenItems[i] == item) {
if (((CAdGame *)Game)->_selectedItem == _takenItems[i])((CAdGame *)Game)->_selectedItem = NULL;
_takenItems.RemoveAt(i);
- return S_OK;
+ return STATUS_OK;
}
}
- return E_FAIL;
+ return STATUS_FAILED;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdInventory::persist(CBPersistMgr *persistMgr) {
+ERRORCODE CAdInventory::persist(CBPersistMgr *persistMgr) {
CBObject::persist(persistMgr);
_takenItems.persist(persistMgr);
persistMgr->transfer(TMEMBER(_scrollOffset));
- return S_OK;
+ return STATUS_OK;
}
} // end of namespace WinterMute
|