thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TONY: Reduce the scope of some variables, change the return type of findPath()

Browse source
This commit is contained in:
Strangerke 2014-02-28 22:20:38 +01:00
parent a140837f79
commit d35f470bf6
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/tony/loc.cpp
View file

@ -892,12 +892,12 @@ void RMWipe::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
/* Returns path along the vector path path[] */
/****************************************************************************/
short RMCharacter::findPath(short source, short destination) {
bool RMCharacter::findPath(short source, short destination) {
static RMBox box[MAXBOXES]; // Matrix of adjacent boxes
static short nodeCost[MAXBOXES]; // Cost per node
static short valid[MAXBOXES]; // 0:Invalid 1:Valid 2:Saturated
static short nextNode[MAXBOXES]; // Next node
short minCost, error = 0;
bool error = false;
RMBoxLoc *cur;
g_system->lockMutex(_csMove);
@ -925,13 +925,13 @@ short RMCharacter::findPath(short source, short destination) {
// Find the shortest path
while (!finish) {
minCost = 32000; // Reset the minimum cost
error = 1; // Possible error
short minCost = 32000; // Reset the minimum cost
error = true; // Possible error
// 1st cycle: explore possible new nodes
for (int i = 0; i < cur->_numbBox; i++) {
if (valid[i] == 1) {
error = 0; // Failure de-bunked
error = false; // Failure de-bunked
int j = 0;
while (((box[i]._adj[j]) != 1) && (j < cur->_numbBox))
j++;
@ -1851,10 +1851,9 @@ void RMGameBoxes::loadState(byte *state) {
assert(nloc <= _nLocBoxes);
int nbox;
// For each location, read the number of boxes and their status
for (int i = 1; i <= nloc; i++) {
nbox = READ_LE_UINT32(state);
int nbox = READ_LE_UINT32(state);
state += 4;
for (int j = 0; j < nbox ; j++) {