games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

Merged most of the changes from trunk.

Browse Source 
Because of really huge amount of modifications here I've probably missed some minor stuff. I doubt if it's still compatible with gcc - some changes should be reapplied.
This commit is contained in:
Michał W. Urbańczyk
2008-08-02 15:08:03 +00:00
parent dc82232e70
commit cc7be20b07
79 changed files with 1635 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hch/CObjectHandler.cpp
View File

@ -102,7 +102,7 @@ int CGObjectInstance::getOwner() const
{
//if (state)
// return state->owner;
//else
//else
return tempOwner; //won't have owner
}
@ -152,7 +152,7 @@ bool CGObjectInstance::operator<(const CGObjectInstance & cmp) const //screen p
return false;
}
bool CGHeroInstance::isHero() const
{
return true;
@ -390,4 +390,4 @@ CGObjectInstance& CGObjectInstance::operator=(const CGObjectInstance & right)
//*state = *right.state;
tempOwner = right.tempOwner;
return *this;
}
}