diff options
author | Le Philousophe | 2019-05-26 18:29:57 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2019-06-01 22:43:48 +0200 |
commit | ff197718c239e10209d8eaf26c90c11af5ed1c80 (patch) | |
tree | 18a344711b6d3388cf450a41dc88f6a223640d33 /engines/cryomni3d/wam_parser.cpp | |
parent | 222f6b0e4cd5afc3d6aae8210b71908b111fca19 (diff) | |
download | scummvm-rg350-ff197718c239e10209d8eaf26c90c11af5ed1c80.tar.gz scummvm-rg350-ff197718c239e10209d8eaf26c90c11af5ed1c80.tar.bz2 scummvm-rg350-ff197718c239e10209d8eaf26c90c11af5ed1c80.zip |
CRYOMNI3D: Rename unsigned int to uint
Diffstat (limited to 'engines/cryomni3d/wam_parser.cpp')
-rw-r--r-- | engines/cryomni3d/wam_parser.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/engines/cryomni3d/wam_parser.cpp b/engines/cryomni3d/wam_parser.cpp index a27e3ab69e..bce98cb521 100644 --- a/engines/cryomni3d/wam_parser.cpp +++ b/engines/cryomni3d/wam_parser.cpp @@ -37,13 +37,13 @@ void WAMParser::loadStream(Common::ReadStream &stream) { stream.read(str, 16); stream.readUint32LE(); - unsigned int nPlaces = stream.readByte(); + uint nPlaces = stream.readByte(); //debug("nPlaces = %u", nPlaces); - for (unsigned int i = 0; i < nPlaces; i++) { + for (uint i = 0; i < nPlaces; i++) { Place place; - unsigned int nWarps = stream.readByte(); + uint nWarps = stream.readByte(); //debug("nWarps = %u", nWarps); - for (unsigned int k = 0; k < 8; k++) { + for (uint k = 0; k < 8; k++) { stream.read(str, 16); //debug("Warp: %.16s", str); if (nWarps > 0) { @@ -58,20 +58,20 @@ void WAMParser::loadStream(Common::ReadStream &stream) { Place *oldPlace = findPlaceById_(place.placeId); if (oldPlace) { debug("Found duplicate place %u at %u, removing it", place.placeId, - (unsigned int)(oldPlace - _places.begin())); + (uint)(oldPlace - _places.begin())); _places.erase(oldPlace); } //debug("nPlaceId = %u", place.placeId); stream.readUint32LE(); - unsigned int nTransitions = stream.readByte(); + uint nTransitions = stream.readByte(); //debug("nTransitions = %u", nTransitions); - unsigned int nZones = stream.readByte(); + uint nZones = stream.readByte(); //debug("nZones = %u", nZones); - for (unsigned int j = 0; j < nTransitions; j++) { + for (uint j = 0; j < nTransitions; j++) { Transition trans; stream.readUint32LE(); - unsigned int nAnimations = stream.readByte(); - for (unsigned int k = 0; k < 8; k++) { + uint nAnimations = stream.readByte(); + for (uint k = 0; k < 8; k++) { stream.read(str, 16); if (nAnimations > 0) { trans.animations.push_back(str); @@ -87,7 +87,7 @@ void WAMParser::loadStream(Common::ReadStream &stream) { trans.dstBeta = stream.readDoubleLE(); place.transitions.push_back(trans); } - for (unsigned int j = 0; j < nZones; j++) { + for (uint j = 0; j < nZones; j++) { Zone zone; zone.zoneId = stream.readSint32LE(); zone.rct.left = stream.readSint32LE(); @@ -101,7 +101,7 @@ void WAMParser::loadStream(Common::ReadStream &stream) { } } -const Place *WAMParser::findPlaceById(unsigned int placeId) const { +const Place *WAMParser::findPlaceById(uint placeId) const { for (Common::Array<Place>::const_iterator it = _places.begin(); it != _places.end(); it++) { if (it->placeId == placeId) { return it; @@ -110,7 +110,7 @@ const Place *WAMParser::findPlaceById(unsigned int placeId) const { return nullptr; } -Place *WAMParser::findPlaceById_(unsigned int placeId) { +Place *WAMParser::findPlaceById_(uint placeId) { for (Common::Array<Place>::iterator it = _places.begin(); it != _places.end(); it++) { if (it->placeId == placeId) { return it; @@ -179,7 +179,7 @@ void Place::setupWarpConstraints(Omni3DManager &omni3d) const { } } -unsigned int Place::hitTest(const Common::Point &point) const { +uint Place::hitTest(const Common::Point &point) const { for (Common::Array<Zone>::const_iterator it = zones.begin(); it != zones.end(); it++) { if (it->action) { if (it->rct.contains(point)) { @@ -203,7 +203,7 @@ unsigned int Place::hitTest(const Common::Point &point) const { return 0; } -const Transition *Place::findTransition(unsigned int nextPlaceId) const { +const Transition *Place::findTransition(uint nextPlaceId) const { for (Common::Array<Transition>::const_iterator it = transitions.begin(); it != transitions.end(); it++) { if (it->dstId == nextPlaceId) { |