mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-27 20:28:27 +00:00
589b65945a
close to each other on the ground. (Happened to me on the first level after destroying the voodoo doll, where I'd drop the banana, the soap and the false nose close to each other on the ground after using them.) Reasoning behind the change: From what I understand, map_itemsMap[] contains information for each "cell" of the map about which objects are there. Each cell can contain two objects which are stored in the upper and lower byte of a 16-bit word. When dropping an object, it is written into map_itemsMap[], but not just to the indicated cell but also to a few of the surrounding ones. Presumably to make it easier to pick it up afterwards. When writing an object to a cell, we check if one of the bytes is already occupied. If it is, write to the other byte. Otherwise, write to that byte. (If both bytes are occupied, one will be overwritten.) The old code assumed that if one byte was free at position (x,y) the same byte would automatically be the free one in the surrounding cells. This could cause bad values in the array, since the item was added to an existing value, rather than replacing it. This new code makes the check for each cell that is modified. (It also gets rid of some code duplication.) svn-id: r17851
73 lines
2.1 KiB
C++
73 lines
2.1 KiB
C++
/* ScummVM - Scumm Interpreter
|
|
* Copyright (C) 2004 Ivan Dubrov
|
|
* Copyright (C) 2004-2005 The ScummVM project
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* $Header$
|
|
*
|
|
*/
|
|
#ifndef GOB_MAP_H
|
|
#define GOB_MAP_H
|
|
|
|
namespace Gob {
|
|
|
|
#pragma START_PACK_STRUCTS
|
|
#define szMap_Point 4
|
|
typedef struct Map_Point {
|
|
int16 x;
|
|
int16 y;
|
|
} GCC_PACK Map_Point;
|
|
|
|
#define szMap_ItemPos 3
|
|
typedef struct Map_ItemPos {
|
|
char x;
|
|
char y;
|
|
char orient; // ??
|
|
} GCC_PACK Map_ItemPos;
|
|
#pragma END_PACK_STRUCTS
|
|
|
|
extern char map_passMap[28][26]; // [y][x]
|
|
extern int16 map_itemsMap[28][26]; // [y][x]
|
|
extern Map_Point map_wayPoints[40];
|
|
extern int16 map_nearestWayPoint;
|
|
extern int16 map_nearestDest;
|
|
|
|
extern int16 map_curGoblinX;
|
|
extern int16 map_curGoblinY;
|
|
extern int16 map_destX;
|
|
extern int16 map_destY;
|
|
extern char map_loadFromAvo;
|
|
|
|
extern Map_ItemPos map_itemPoses[40];
|
|
extern char map_sourceFile[15];
|
|
|
|
void map_placeItem(int16 x, int16 y, int16 id);
|
|
|
|
int16 map_getDirection(int16 x0, int16 y0, int16 x1, int16 y1);
|
|
void map_findNearestToGob(void);
|
|
void map_findNearestToDest(void);
|
|
int16 map_checkDirectPath(int16 x0, int16 y0, int16 x1, int16 y1);
|
|
int16 map_checkLongPath(int16 x0, int16 y0, int16 x1, int16 y1, int16 i0, int16 i1);
|
|
int16 map_optimizePoints(int16 xPos, int16 yPos);
|
|
void map_loadItemToObject(void);
|
|
void map_loadMapObjects(char *avjFile);
|
|
void map_loadDataFromAvo(char *dest, int16 size);
|
|
void map_loadMapsInitGobs(void);
|
|
|
|
} // End of namespace Gob
|
|
|
|
#endif /* __MAP_H */
|