marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

objects: DoCon always preserves the position of the bottom of the object 

Previously, it only did so on object creation, on straight objects, and did
something strange to rotated buildings.
Günther Brammer 2011-01-02 02:03:44 +01:00
parent 6d7e7c6989
commit e32650d378
3 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/C4Game.cpp
View File

@ -999,7 +999,7 @@ C4Object* C4Game::NewObject( C4PropList *pDef, C4Object *pCreator,
// AssignRemoval called? (Con 0)
if (!pObj->Status) { return NULL; }
// Do initial con
pObj->DoCon(iCon,true);
pObj->DoCon(iCon);
// AssignRemoval called? (Con 0)
if (!pObj->Status) { return NULL; }
// Success

40
src/game/object/C4Object.cpp
View File

@ -1368,7 +1368,7 @@ void C4Object::Blast(int32_t iLevel, int32_t iCausedBy)
Incinerate(iCausedBy,true);
}
void C4Object::DoCon(int32_t iChange, bool fInitial, bool fNoComponentChange)
void C4Object::DoCon(int32_t iChange)
{
int32_t iStepSize=FullCon/100;
int32_t lRHgt=Shape.Hgt,lRy=Shape.GetY();
@ -1397,15 +1397,12 @@ void C4Object::DoCon(int32_t iChange, bool fInitial, bool fNoComponentChange)
// Face
UpdateFace(true);
// component update
if (!fNoComponentChange)
{
// Decay: reduce components
if (iChange<0)
ComponentConCutoff();
// Growth: gain components
else
ComponentConGain();
}
// Decay: reduce components
if (iChange<0)
ComponentConCutoff();
// Growth: gain components
else
ComponentConGain();
// Unfullcon
if (Con<FullCon)
{
@ -1423,27 +1420,14 @@ void C4Object::DoCon(int32_t iChange, bool fInitial, bool fNoComponentChange)
if (!Def->IncompleteActivity)
SetAction(0);
}
else
// set first position
if (fInitial) UpdatePos();
// Straight Con bottom y-adjust
if (!r || fInitial)
// bottom y-adjust
if ((Shape.Hgt!=lRHgt) || (Shape.GetY()!=lRy))
{
if ((Shape.Hgt!=lRHgt) || (Shape.GetY()!=lRy))
{
fix_y = strgt_con_b - Shape.Hgt - Shape.GetY();
UpdatePos(); UpdateSolidMask(false);
}
fix_y = strgt_con_b - Shape.Hgt - Shape.GetY();
UpdatePos(); UpdateSolidMask(false);
}
else if (Category & C4D_Structure) if (iStepDiff > 0)
{
// even rotated buildings need to be moved upwards
// but by con difference, because with keep-bottom-method, they might still be sinking
// besides, moving the building up may often stabilize it
fix_y -= ((iLastStep+iStepDiff) * Def->Shape.Hgt / 100) - (iLastStep * Def->Shape.Hgt / 100);
UpdatePos(); UpdateSolidMask(false);
}
// Completion (after bottom GetY()-adjust for correct position)
if (!fWasFull && (Con>=FullCon))
{

2
src/game/object/C4Object.h
View File

@ -307,7 +307,7 @@ public:
void DoEnergy(int32_t iChange, bool fExact, int32_t iCause, int32_t iCausedByPlr);
void UpdatLastEnergyLossCause(int32_t iNewCausePlr);
void DoBreath(int32_t iChange);
void DoCon(int32_t iChange, bool fInitial=false, bool fNoComponentChange=false);
void DoCon(int32_t iChange);
int32_t GetCon() { return Con; }
void DoExperience(int32_t change);
bool Promote(int32_t torank, bool exception, bool fForceRankName);