games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Fixed #351.

Browse Source 
Fixed grail placement.
Fixed crashbug with removing monster on RoE map.
Version set to 0.75d
This commit is contained in:
Michał W. Urbańczyk
2010-02-12 00:53:25 +00:00
parent 5d0186a10b
commit 51946e60a5
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/CPlayerInterface.cpp
View File

@@ -230,9 +230,10 @@ void CPlayerInterface::heroMoved(const TryMoveHero & details)
if(makingTurn && ho->tempOwner == playerID) //we are moving our hero - we may need to update assigned path if(makingTurn && ho->tempOwner == playerID) //we are moving our hero - we may need to update assigned path
{ {
if(details.result == TryMoveHero::TELEPORTATION/* || details.start == details.end*/) if(details.result == TryMoveHero::TELEPORTATION || details.start == details.end)
{ {
adventureInt->eraseCurrentPathOf(ho); if(adventureInt->terrain.currentPath)
adventureInt->eraseCurrentPathOf(ho);
return; //teleport - no fancy moving animation return; //teleport - no fancy moving animation
//TODO: smooth disappear / appear effect //TODO: smooth disappear / appear effect
} }

2
global.h
View File

@@ -20,7 +20,7 @@ typedef boost::int8_t si8; //signed int 8 bits (1 byte)
#define THC #define THC
#endif #endif
#define NAME_VER ("VCMI 0.75c") #define NAME_VER ("VCMI 0.75d")
extern std::string NAME; //full name extern std::string NAME; //full name
extern std::string NAME_AFFIX; //client / server extern std::string NAME_AFFIX; //client / server
#define CONSOLE_LOGGING_LEVEL 5 #define CONSOLE_LOGGING_LEVEL 5

2
lib/NetPacksLib.cpp
View File

@@ -286,7 +286,7 @@ DLL_EXPORT void RemoveObject::applyGs( CGameState *gs )
//TODO: add to the pool? //TODO: add to the pool?
} }
else if (obj->ID==CREI_TYPE) //only fixed monsters can be a part of quest else if (obj->ID==CREI_TYPE && gs->map->version > CMapHeader::RoE) //only fixed monsters can be a part of quest
{ {
CGCreature *cre = static_cast<CGCreature*>(obj); CGCreature *cre = static_cast<CGCreature*>(obj);
gs->map->monsters[cre->identifier]->pos = int3 (-1,-1,-1); //use nonexistent monster for quest :> gs->map->monsters[cre->identifier]->pos = int3 (-1,-1,-1); //use nonexistent monster for quest :>

2
lib/map.cpp
View File

@@ -529,7 +529,7 @@ void Mapa::addBlockVisTiles(CGObjectInstance * obj)
} }
} }
Mapa::Mapa(std::string filename) Mapa::Mapa(std::string filename)
:grailPos(-1, -1, -1) :grailPos(-1, -1, -1), grailRadious(0)
{ {
int mapsize = 0; int mapsize = 0;