libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOON: Semicolon cleanup

Browse Source 
svn-id: r53096
This commit is contained in:
Ori Avtalion 2010-10-09 10:29:11 +00:00
parent 88416b870d
commit 2ab013941a
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/toon/anim.h
View File

@ -108,19 +108,19 @@ public:
void setUseMask(bool useMask);
void moveRelative(int32 dx, int32 dy, int32 dz);
void getRect(int32 *x1, int32 *y1, int32 *x2, int32 *y2) const;
int32 getX() const { return _x; };
int32 getY() const { return _y; };
int32 getZ() const { return _z; };
int32 getX() const { return _x; }
int32 getY() const { return _y; }
int32 getZ() const { return _z; }
int32 getX2() const;
int32 getY2() const;
int32 getZ2() const;
int32 getFrame() const { return _currentFrame; };
int32 getFrame() const { return _currentFrame; }
void reset();
void save(Common::WriteStream *stream);
void load(Common::ReadStream *stream);
void setId(int32 id) { _id = id; };
int32 getId() const { return _id; };
void setId(int32 id) { _id = id; }
int32 getId() const { return _id; }
void setX(int32 x, bool relative = false);
void setY(int32 y, bool relative = false);

6
engines/toon/audio.h
View File

@ -57,13 +57,13 @@ protected:
int32 readBuffer(int16 *buffer, const int numSamples);
bool isStereo() const {
return false;
};
}
int getRate() const {
return 22100;
};
}
bool endOfData() const {
return _stopped;
};
}
void handleFade(int32 numSamples);
void stopNow();

2
engines/toon/character.h
View File

@ -94,7 +94,7 @@ public:
virtual void stopWalk();
virtual void stopSpecialAnim();
virtual void updateIdle();
virtual int32 getRandomIdleAnim() { return 0; };
virtual int32 getRandomIdleAnim() { return 0; }
int32 getFacingFromDirection(int32 dx, int32 dy);
static const SpecialCharacterAnimation *getSpecialAnimation(int32 characterId, int32 animationId);

4
engines/toon/hotspot.h
View File

@ -42,7 +42,7 @@ public:
int16 getPriority() const { return READ_LE_INT16(_data + 7); }
int16 getType() const { return READ_LE_INT16(_data + 8); }
int16 getData(int32 id) const { return READ_LE_INT16(_data + id); }
void setData(int32 id, int16 val) { WRITE_LE_UINT16(&_data[id], val); };
void setData(int32 id, int16 val) { WRITE_LE_UINT16(&_data[id], val); }
private:
int16 _data[256];
@ -57,7 +57,7 @@ public:
int32 Find(int32 x, int32 y);
int32 FindBasedOnCorner(int32 x, int32 y);
HotspotData *Get(int32 id);
int32 getCount() const { return _numItems; };
int32 getCount() const { return _numItems; }
void load(Common::ReadStream *Stream);
void save(Common::WriteStream *Stream);

2
engines/toon/resource.h
View File

@ -40,7 +40,7 @@ public:
void open(Common::SeekableReadStream *rs, Common::String packName, bool preloadEntirePackage);
uint8 *getFileData(Common::String fileName, uint32 *fileSize);
Common::String getPackName() { return _packName; };
Common::String getPackName() { return _packName; }
Common::SeekableReadStream *createReadStream(Common::String fileName);
void close();