Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

savegame/loadgame works too now with the new blocking feature.

Browse Source
This commit is contained in:
Titus Tscharntke 2012-09-15 23:43:31 +00:00
parent 4f19451a6a
commit 78643ddcfc
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/glest_game/world/map.cpp
View File

@ -1381,9 +1381,7 @@ void Map::putUnitCells(Unit *unit, const Vec2i &pos, bool ignoreSkill) {
if(unit == NULL) {
throw megaglest_runtime_error("ut == NULL");
}
bool canPutInCell = true;
const UnitType *ut= unit->getType();
putUnitCellsPrivate(unit, pos, unit->getType(), false);
// block space for morphing units
if(ignoreSkill==false &&
@ -1393,10 +1391,19 @@ void Map::putUnitCells(Unit *unit, const Vec2i &pos, bool ignoreSkill) {
if(command != NULL && command->getCommandType()->commandTypeClass == ccMorph){
const MorphCommandType *mct= static_cast<const MorphCommandType*>(command->getCommandType());
if(unit->getType()->getSize()<=mct->getMorphUnit()->getSize()){
ut=mct->getMorphUnit();
putUnitCellsPrivate(unit, pos, mct->getMorphUnit(),true);
}
}
}
}
void Map::putUnitCellsPrivate(Unit *unit, const Vec2i &pos, const UnitType *ut, bool isMorph) {
assert(unit != NULL);
if(unit == NULL) {
throw megaglest_runtime_error("ut == NULL");
}
bool canPutInCell = true;
Field field=ut->getField();
for(int i = 0; i < ut->getSize(); ++i) {
for(int j = 0; j < ut->getSize(); ++j) {
@ -1440,9 +1447,7 @@ void Map::putUnitCells(Unit *unit, const Vec2i &pos, bool ignoreSkill) {
}
if(getCell(currPos)->getUnit(field) == NULL ||
getCell(currPos)->getUnit(field) == unit) {
if(unit->getCurrSkill() != NULL &&
unit->getCurrSkill()->getClass() == scMorph &&
unit->getType()->getName(false)!=ut->getName(false)){
if(isMorph){
// unit is beeing morphed to another unit with maybe other field.
getCell(currPos)->setUnit(field, unit);
canPutInCell = false;

1
source/glest_game/world/map.h
View File

@ -576,6 +576,7 @@ private:
void smoothSurface(Tileset *tileset);
void computeNearSubmerged();
void computeCellColors();
void putUnitCellsPrivate(Unit *unit, const Vec2i &pos, const UnitType *ut, bool isMorph);
};

1
source/glest_game/world/unit_updater.cpp
View File

@ -1902,7 +1902,6 @@ void UnitUpdater::updateMorph(Unit *unit, int frameIndex) {
unit->setCurrSkill(mct->getMorphSkillType());
// block space for morphing units ( block space before and after morph ! )
map->putUnitCells(unit, unit->getPos());
map->putUnitCells(unit, unit->getPos(), true);
}
else{
if(unit->getFactionIndex()==world->getThisFactionIndex()){