mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 03:09:49 +02:00
Code Issues Projects Releases Wiki Activity

Fixed broken links

Browse Source
This commit is contained in:
mathusummut
2019-03-29 00:47:32 +01:00
parent 072940cacf
commit fcb0631539
8 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/game/types/unit_type.cpp
View File

@@ -1338,9 +1338,6 @@ namespace Game {
bool UnitType::getCellMapCell(int x, int y, CardinalDir facing) const {
assert(cellMap);
if (cellMap == NULL) {
throw game_runtime_error("cellMap == NULL");
}
//checkItemInVault(&(this->size),this->size);
int tmp = 0;

3
source/game/world/map.cpp
View File

@@ -1352,7 +1352,8 @@ namespace Game {
assert(isInside(currPos));
if (ut->hasCellMap() == false || ut->getCellMapCell(i, j, unit->getModelFacing())) {
if (getCell(currPos)->getUnit(field) != NULL && getCell(currPos)->getUnit(field) != unit) {
Unit* current = getCell(currPos)->getUnit(field);
if (current != NULL && current != unit) {
//if unit tries to move into a cell where another unit resides cancel the move command
if (unit->getCurrSkill() != NULL &&
unit->getCurrSkill()->getClass() == scMove) {

2
source/game/world/map.h
View File

@@ -69,7 +69,7 @@ namespace Game {
private:
Cell(Cell&);
void operator=(Cell&);
//void operator=(Cell&);
public:
Cell();

2
source/shared_lib/include/util/util.h
View File

@@ -69,7 +69,7 @@ namespace Shared {
flags |= flag;
}
static bool isFlagSet(GlobalStaticFlagTypes flag) {
return (flags & (unsigned int) flag) == (unsigned int) flag;
return (flags & flag) == flag;
}
protected: