diff options
author | Littleboy | 2012-08-21 23:16:52 -0400 |
---|---|---|
committer | Littleboy | 2012-08-27 21:49:40 -0400 |
commit | 275aded0b0e485eead8d5bdac48d9c8dc1a6ef9c (patch) | |
tree | f2730b34374edec109ada9671295da5563781f0d /engines/lastexpress/entities | |
parent | bc4e10dabca5b76283eb6fb431702ccd92a001c0 (diff) | |
download | scummvm-rg350-275aded0b0e485eead8d5bdac48d9c8dc1a6ef9c.tar.gz scummvm-rg350-275aded0b0e485eead8d5bdac48d9c8dc1a6ef9c.tar.bz2 scummvm-rg350-275aded0b0e485eead8d5bdac48d9c8dc1a6ef9c.zip |
LASTEXPRESS: Remove unnecessary casts
Diffstat (limited to 'engines/lastexpress/entities')
-rw-r--r-- | engines/lastexpress/entities/entity.cpp | 4 | ||||
-rw-r--r-- | engines/lastexpress/entities/entity.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp index 88b2ada185..dad5e67392 100644 --- a/engines/lastexpress/entities/entity.cpp +++ b/engines/lastexpress/entities/entity.cpp @@ -50,7 +50,7 @@ EntityData::EntityCallData::~EntityCallData() { SAFE_DELETE(sequence3); } -void EntityData::EntityCallData::syncString(Common::Serializer &s, Common::String &string, int length) const { +void EntityData::EntityCallData::syncString(Common::Serializer &s, Common::String &string, uint length) const { char seqName[13]; memset(&seqName, 0, length); @@ -117,7 +117,7 @@ EntityData::EntityParameters *EntityData::getParameters(uint callback, byte inde return _parameters[callback].parameters[index]; } -int EntityData::getCallback(uint callback) const { +byte EntityData::getCallback(uint callback) const { if (callback >= 16) error("[EntityData::getCallback] Invalid callback value (was: %d, max: 16)", callback); diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h index c45367c43c..c67d13db9e 100644 --- a/engines/lastexpress/entities/entity.h +++ b/engines/lastexpress/entities/entity.h @@ -822,7 +822,7 @@ public: * @param string The string. * @param length Length of the string. */ - void syncString(Common::Serializer &s, Common::String &string, int length) const; + void syncString(Common::Serializer &s, Common::String &string, uint length) const; // Serializable void saveLoadWithSerializer(Common::Serializer &s); @@ -845,8 +845,8 @@ public: EntityParameters *getCurrentParameters(byte index = 0) { return getParameters(_data.currentCall, index); } EntityCallParameters *getCurrentCallParameters() { return &_parameters[_data.currentCall]; } - int getCallback(uint callback) const; - int getCurrentCallback() { return getCallback(_data.currentCall); } + byte getCallback(uint callback) const; + byte getCurrentCallback() { return getCallback(_data.currentCall); } void setCallback(uint callback, byte index); void setCurrentCallback(uint index) { setCallback(_data.currentCall, index); } |