Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

unit references updated

Browse source
This commit is contained in:
johns 2000-05-07 16:32:15 +00:00
parent 3406a2dc5e
commit 23dfb9be90
3 changed files with 54 additions and 24 deletions

54
src/action/action_harvest.cpp
View file

@ -204,6 +204,9 @@ local int ChopWood(Unit* unit)
unit->Command.Data.Move.Fast=1;
unit->Command.Data.Move.Range=1;
unit->Command.Data.Move.Goal=destu;
#ifdef NEW_UNIT
destu->Refs++;
#endif
#if 1
// Fast movement need this??
NearestOfUnit(destu,unit->X,unit->Y
@ -226,7 +229,7 @@ local int ChopWood(Unit* unit)
return 0;
}
/*
/**
** Return with the wood.
** Return TRUE if reached, otherwise FALSE.
*/
@ -234,8 +237,6 @@ local int ReturnWithWood(Unit* unit)
{
int x;
int y;
//int dx;
//int dy;
Unit* destu;
if( !HandleActionMove(unit) ) { // reached end-point
@ -244,29 +245,38 @@ local int ReturnWithWood(Unit* unit)
DebugCheck( unit->Wait!=1 );
#if 0
// reached nearly? and is there an wood deposit?
x=unit->Command.Data.Move.DX;
y=unit->Command.Data.Move.DY;
dx=unit->X-x;
dy=unit->Y-y;
destu=WoodDepositOnMap(x,y);
DebugLevel3("Near unit %d,%d =%Zd\n",x,y,UnitNumber(destu));
if( !destu || dx<-1 || dx>destu->Type->TileWidth
|| dy<-1 || dy>destu->Type->TileHeight ) {
DebugLevel2("WOOD-DEPOSIT NOT REACHED %d=%d,%Zd\n"
,UnitNumber(destu),dx,dy);
unit->Command.Action=UnitActionStill;
unit->SubAction=0;
return 0;
destu=unit->Command.Data.Move.Goal;
//
// Target is dead, stop harvest
//
if( destu ) {
if( destu->Destroyed ) {
DebugLevel0(__FUNCTION__": destroyed unit\n");
if( !--destu->Refs ) {
ReleaseUnit(destu);
}
unit->Command.Data.Move.Goal=NoUnitP;
// FIXME: perhaps I should choose an alternative
unit->Command.Action=UnitActionStill;
return 0;
} else if( destu->Removed || !destu->HP
|| destu->Command.Action==UnitActionDie ) {
--destu->Refs;
unit->Command.Data.Move.Goal=NoUnitP;
// FIXME: perhaps I should choose an alternative
unit->Command.Action=UnitActionStill;
return 0;
}
unit->Command.Data.Move.Goal=NoUnitP;
--destu->Refs;
}
#endif
// FIXME: stored target not used!
x=unit->Command.Data.Move.DX;
y=unit->Command.Data.Move.DY;
destu=WoodDepositOnMap(x,y);
if( !destu || MapDistanceToUnit(unit->X,unit->Y,destu)!=1 ) {
DebugLevel2("WOOD-DEPOSIT NOT REACHED %Zd=%d,%d ? %d\n"
,UnitNumber(destu),x,y

13
src/action/action_returngoods.cpp
View file

@ -52,11 +52,14 @@ global void HandleActionReturnGoods(Unit* unit)
}
unit->Command.Data.Move.Fast=1;
unit->Command.Data.Move.Goal=destu;
#ifdef NEW_UNITS
++destu->Refs;
#endif
unit->Command.Data.Move.Range=1;
#if 1
NearestOfUnit(destu,unit->X,unit->Y
,&unit->Command.Data.Move.DX
,&unit->Command.Data.Move.DY);
,&unit->Command.Data.Move.DX
,&unit->Command.Data.Move.DY);
#else
unit->Command.Data.Move.DX=destu->X;
unit->Command.Data.Move.DY=destu->Y;
@ -75,6 +78,9 @@ global void HandleActionReturnGoods(Unit* unit)
}
unit->Command.Data.Move.Fast=1;
unit->Command.Data.Move.Goal=destu;
#ifdef NEW_UNITS
++destu->Refs;
#endif
unit->Command.Data.Move.Range=1;
#if 1
NearestOfUnit(destu,unit->X,unit->Y
@ -102,6 +108,9 @@ global void HandleActionReturnGoods(Unit* unit)
}
unit->Command.Data.Move.Fast=1;
unit->Command.Data.Move.Goal=destu;
#ifdef NEW_UNITS
++destu->Refs;
#endif
unit->Command.Data.Move.Range=1;
#if 1
NearestOfUnit(destu,unit->X,unit->Y

11
src/action/action_unload.cpp
View file

@ -43,6 +43,7 @@ local int MoveToCoast(Unit* unit)
int i;
DebugLevel3("%p\n",unit->Command.Data.Move.Goal);
if( !(i=HandleActionMove(unit)) ) { // reached end-point
return 0;
}
@ -69,6 +70,16 @@ local void LeaveTransporter(Unit* unit)
goal=unit->Command.Data.Move.Goal;
DebugLevel3("Goal %p\n",goal);
if( goal ) {
#ifdef NEW_UNIT
if( goal->Destroyed ) {
DebugLevel0(__FUNCTION__": destroyed unit\n");
if( !--goal->Refs ) {
ReleaseUnit(goal);
}
return;
}
--goal->Refs;
#endif
for( i=0; i<MAX_UNITS_ONBOARD; ++i ) {
if( goal==unit->OnBoard[i] ) {
goal->X=unit->X;