Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Replace some uses of BASE_OBJECT* with DROID* to reduce yet some casting 

* Fix indentation


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4653 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-04-16 00:15:29 +00:00
parent 21b3597284
commit 2f7817c772
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mapgrid.c
View File

@ -193,29 +193,29 @@ static void gridCalcCoverage(BASE_OBJECT *psObj, SDWORD objx, SDWORD objy, COVER
void gridAddObject(BASE_OBJECT *psObj)
{
ASSERT(!isDead(psObj), "Added a dead object to the map grid!");
gridCalcCoverage(psObj, (SDWORD)psObj->pos.x, (SDWORD)psObj->pos.y, GRID_ADDOBJECT);
gridCalcCoverage(psObj, (SDWORD)psObj->pos.x, (SDWORD)psObj->pos.y, GRID_ADDOBJECT);
}
// move an object within the grid
// oldX,oldY are the old position of the object in world coords
void gridMoveObject(BASE_OBJECT *psObj, SDWORD oldX, SDWORD oldY)
void gridMoveDroid(DROID* psDroid, SDWORD oldX, SDWORD oldY)
{
if (map_coord(psObj->pos.x) == map_coord(oldX)
&& map_coord(psObj->pos.y) == map_coord(oldY))
if (map_coord(psDroid->pos.x) == map_coord(oldX)
&& map_coord(psDroid->pos.y) == map_coord(oldY))
{
// havn't changed the tile the object is on, don't bother updating
return;
}
gridCalcCoverage(psObj, oldX,oldY, GRID_REMOVEOBJECT);
gridCalcCoverage(psObj, (SDWORD)psObj->pos.x, (SDWORD)psObj->pos.y, GRID_ADDOBJECT);
gridCalcCoverage((BASE_OBJECT*)psDroid, oldX,oldY, GRID_REMOVEOBJECT);
gridCalcCoverage((BASE_OBJECT*)psDroid, psDroid->pos.x, psDroid->pos.y, GRID_ADDOBJECT);
}
// remove an object from the grid system
void gridRemoveObject(BASE_OBJECT *psObj)
{
gridCalcCoverage(psObj, (SDWORD)psObj->pos.x, (SDWORD)psObj->pos.y, GRID_REMOVEOBJECT);
gridCalcCoverage(psObj, (SDWORD)psObj->pos.x, (SDWORD)psObj->pos.y, GRID_REMOVEOBJECT);
#if defined(DEBUG)
{

4
src/mapgrid.h
View File

@ -57,9 +57,9 @@ extern void gridReset(void);
// add an object to the grid system
extern void gridAddObject(BASE_OBJECT *psObj);
// move an object within the grid
// move a DROID within the grid
// oldX,oldY are the old position of the object in world coords
extern void gridMoveObject(BASE_OBJECT *psObj, SDWORD oldX, SDWORD oldY);
extern void gridMoveDroid(DROID* psDroid, SDWORD oldX, SDWORD oldY);
// remove an object from the grid system
extern void gridRemoveObject(BASE_OBJECT *psObj);

2
src/move.c
View File

@ -3384,7 +3384,7 @@ void moveUpdateDroid(DROID *psDroid)
|| map_coord(oldy) != map_coord(psDroid->pos.y))
{
visTilesUpdate((BASE_OBJECT *)psDroid);
gridMoveObject((BASE_OBJECT *)psDroid, (SDWORD)oldx,(SDWORD)oldy);
gridMoveDroid(psDroid, (SDWORD)oldx,(SDWORD)oldy);
// object moved from one tile to next, check to see if droid is near stuff.(oil)
checkLocalFeatures(psDroid);

4
src/multisync.c
View File

@ -575,7 +575,7 @@ static void offscreenUpdate(DROID *psDroid,
psDroid->pos.x = (UWORD) fx; //update move progress
psDroid->pos.y = (UWORD) fy;
gridMoveObject((BASE_OBJECT *)psDroid, (SDWORD)oldx,(SDWORD)oldy);
gridMoveDroid(psDroid, (SDWORD)oldx,(SDWORD)oldy);
psDroid->direction = dir % 360; // update rotation
@ -593,7 +593,7 @@ static void offscreenUpdate(DROID *psDroid,
debug(LOG_MULTISYNC, "Moving droid %d from (%u,%u) to (%u,%u)", (int)psDroid->id, oldx, oldy, (UDWORD)fx, (UDWORD)fy);
psDroid->pos.x = (UWORD)x; //update x
psDroid->pos.y = (UWORD)y; //update y
gridMoveObject((BASE_OBJECT *)psDroid, (SDWORD)oldx,(SDWORD)oldy);
gridMoveDroid(psDroid, (SDWORD)oldx,(SDWORD)oldy);
psDroid->direction = dir % 360; // update rotation
}