aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe/gameloader.h
diff options
context:
space:
mode:
authorEugene Sandulenko2013-09-18 19:17:19 +0400
committerEugene Sandulenko2013-09-18 19:39:53 +0400
commit1ce1712b7ba5042ab88d1ad6d825d249836c7d7b (patch)
treec8f26018b410b6c86dbe18b82481df556f8f82ff /engines/fullpipe/gameloader.h
parentc354981037621fd1bc7b44381d0e7d24d984d5a6 (diff)
downloadscummvm-rg350-1ce1712b7ba5042ab88d1ad6d825d249836c7d7b.tar.gz
scummvm-rg350-1ce1712b7ba5042ab88d1ad6d825d249836c7d7b.tar.bz2
scummvm-rg350-1ce1712b7ba5042ab88d1ad6d825d249836c7d7b.zip
FULLPIPE: Remove C* prefix from inventory classes
Diffstat (limited to 'engines/fullpipe/gameloader.h')
-rw-r--r--engines/fullpipe/gameloader.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index fe0ec95c4c..2fe8bf730f 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -92,7 +92,7 @@ class CGameLoader : public CObject {
GameProject *_gameProject;
InteractionController *_interactionController;
InputController *_inputController;
- CInventory2 _inventory;
+ Inventory2 _inventory;
Sc2Array _sc2array;
void *_sceneSwitcher;
bool (*_preloadCallback)(const PreloadItem &pre, int flag);
@@ -108,7 +108,7 @@ class CGameLoader : public CObject {
int _preloadEntranceId;
};
-CInventory2 *getGameLoaderInventory();
+Inventory2 *getGameLoaderInventory();
InteractionController *getGameLoaderInteractionController();
MctlCompound *getSc2MctlCompoundBySceneId(int16 sceneId);