aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_lok.h
diff options
context:
space:
mode:
authorJohannes Schickel2012-11-19 13:05:12 +0100
committerJohannes Schickel2012-11-19 13:06:09 +0100
commitbbb83f132b23b6a45eb6d979172264c1587f227a (patch)
tree35efe06598ce4ed8f924f2638d32e1dd2f31e034 /engines/kyra/kyra_lok.h
parentdd551c4775ab016ad9d24e2d48a0919bf5739d4b (diff)
downloadscummvm-rg350-bbb83f132b23b6a45eb6d979172264c1587f227a.tar.gz
scummvm-rg350-bbb83f132b23b6a45eb6d979172264c1587f227a.tar.bz2
scummvm-rg350-bbb83f132b23b6a45eb6d979172264c1587f227a.zip
KYRA: Make "const type *const" use consistent.
I used this command for changing "const type * const" to "const type *const": git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/const \([a-zA-Z0-9_]*\) \* const/const \1 \*const/g'
Diffstat (limited to 'engines/kyra/kyra_lok.h')
-rw-r--r--engines/kyra/kyra_lok.h70
1 files changed, 35 insertions, 35 deletions
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index 7470dd871b..def5cbcf6f 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -126,13 +126,13 @@ public:
typedef bool (KyraEngine_LoK::*IntroProc)();
// static data access
- const char * const *seqWSATable() { return _seq_WSATable; }
- const char * const *seqCPSTable() { return _seq_CPSTable; }
- const char * const *seqCOLTable() { return _seq_COLTable; }
- const char * const *seqTextsTable() { return _seq_textsTable; }
+ const char *const *seqWSATable() { return _seq_WSATable; }
+ const char *const *seqCPSTable() { return _seq_CPSTable; }
+ const char *const *seqCOLTable() { return _seq_COLTable; }
+ const char *const *seqTextsTable() { return _seq_textsTable; }
- const uint8 * const *palTable1() { return &_specialPalettes[0]; }
- const uint8 * const *palTable2() { return &_specialPalettes[29]; }
+ const uint8 *const *palTable1() { return &_specialPalettes[0]; }
+ const uint8 *const *palTable2() { return &_specialPalettes[29]; }
protected:
virtual Common::Error go();
@@ -538,12 +538,12 @@ protected:
const uint8 *_seq_Demo4;
const uint8 *_seq_Reunion;
- const char * const *_seq_WSATable;
- const char * const *_seq_CPSTable;
- const char * const *_seq_COLTable;
- const char * const *_seq_textsTable;
+ const char *const *_seq_WSATable;
+ const char *const *_seq_CPSTable;
+ const char *const *_seq_COLTable;
+ const char *const *_seq_textsTable;
- const char * const *_storyStrings;
+ const char *const *_storyStrings;
int _seq_WSATable_Size;
int _seq_CPSTable_Size;
@@ -552,25 +552,25 @@ protected:
int _storyStringsSize;
- const char * const *_itemList;
- const char * const *_takenList;
- const char * const *_placedList;
- const char * const *_droppedList;
- const char * const *_noDropList;
- const char * const *_putDownFirst;
- const char * const *_waitForAmulet;
- const char * const *_blackJewel;
- const char * const *_poisonGone;
- const char * const *_healingTip;
- const char * const *_thePoison;
- const char * const *_fluteString;
- const char * const *_wispJewelStrings;
- const char * const *_magicJewelString;
- const char * const *_flaskFull;
- const char * const *_fullFlask;
- const char * const *_veryClever;
- const char * const *_homeString;
- const char * const *_newGameString;
+ const char *const *_itemList;
+ const char *const *_takenList;
+ const char *const *_placedList;
+ const char *const *_droppedList;
+ const char *const *_noDropList;
+ const char *const *_putDownFirst;
+ const char *const *_waitForAmulet;
+ const char *const *_blackJewel;
+ const char *const *_poisonGone;
+ const char *const *_healingTip;
+ const char *const *_thePoison;
+ const char *const *_fluteString;
+ const char *const *_wispJewelStrings;
+ const char *const *_magicJewelString;
+ const char *const *_flaskFull;
+ const char *const *_fullFlask;
+ const char *const *_veryClever;
+ const char *const *_homeString;
+ const char *const *_newGameString;
int _itemList_Size;
int _takenList_Size;
@@ -592,13 +592,13 @@ protected:
int _homeString_Size;
int _newGameString_Size;
- const char * const *_characterImageTable;
+ const char *const *_characterImageTable;
int _characterImageTableSize;
- const char * const *_guiStrings;
+ const char *const *_guiStrings;
int _guiStringsSize;
- const char * const *_configStrings;
+ const char *const *_configStrings;
int _configStringsSize;
Shape *_defaultShapeTable;
@@ -636,12 +636,12 @@ protected:
Room *_roomTable;
int _roomTableSize;
- const char * const *_roomFilenameTable;
+ const char *const *_roomFilenameTable;
int _roomFilenameTableSize;
const uint8 *_amuleteAnim;
- const uint8 * const *_specialPalettes;
+ const uint8 *const *_specialPalettes;
// positions of the inventory
static const uint16 _itemPosX[];