Alexander Shishkin
4df16d525a
Merge pull request #130 from vmarkovtsev/issue/2306
...
Issue/2306
2015-11-01 01:10:27 +03:00
AlexVinS
34cc9c78f7
[c::b] update projects
2015-11-01 00:01:41 +03:00
DjWarmonger
621c62b44e
Don't crash when spell school level is higher than 3 (which is another bug)
2015-10-31 21:15:40 +01:00
Vadim Markovtsev
5c623868bf
Fix invalid dynamic_cast replacement
2015-10-31 23:01:22 +03:00
Vadim Markovtsev
e6e975e9ef
Fix adventure map movement segfault in some scenarios
2015-10-31 20:23:13 +03:00
Vadim Markovtsev
fa8a282696
Fix pthread_mutex_lock abort() in requestActionASAP impl
2015-10-31 18:04:06 +03:00
DjWarmonger
5ef02aaf88
Updated MSVS project.
2015-10-31 15:08:13 +01:00
DjWarmonger
17071c6ec8
Merge pull request #125 from ArseniyShestakov/newMovementSystem
...
Okay, time to merge this.
2015-10-31 13:56:22 +01:00
Vadim Markovtsev
68cc860133
Fix dynamic_cast on MacOSX in CQuery.cpp
2015-10-31 15:05:52 +03:00
ArseniyShestakov
a0a55974ea
Fix issue 2320. Town events for buildings should now work
2015-10-28 08:46:43 +03:00
ArseniyShestakov
c4ea0c7ff2
CPathfinder: don't include RegisterTypes
2015-10-27 17:42:31 +03:00
Alexander Shishkin
610318d5d3
Merge pull request #129 from vmarkovtsev/issue/2306
...
Fix the second crash (dynamic_cast failure)
2015-10-27 13:23:42 +03:00
Vadim Markovtsev
c5ebec0d1f
Fix the second crash (dynamic_cast failure)
2015-10-27 09:09:42 +03:00
ArseniyShestakov
92fee1bdbf
CPathfinder: shorten options struct declaration
2015-10-27 03:50:38 +03:00
ArseniyShestakov
6b34eb729e
Move all pathfinding-related code into new file
2015-10-27 03:34:47 +03:00
ArseniyShestakov
9e8427a078
CPathfinder: update comment for isSourceGuarded condition
2015-10-27 00:22:40 +03:00
DjWarmonger
94f8e1e9e4
Merge pull request #127 from vcmi/moreCatchingSectors
...
Cache SectorMap where possible and update when necessary.
2015-10-26 21:31:17 +01:00
ArseniyShestakov
01257efc02
CPathfinder: get rid of curPos and pass on initializeGraph
2015-10-26 20:17:10 +03:00
DjWarmonger
1e36f3cecd
Cache SectorMap where possible and update when necessary.
2015-10-26 16:38:17 +01:00
ArseniyShestakov
68bd37aa45
Store penalty in value of FLYING_MOVEMENT and WATER_WALKING
2015-10-26 18:30:11 +03:00
AlexVinS
c9e03405f2
fix a warning
2015-10-25 23:17:33 +03:00
AlexVinS
e8e484bbca
Merge branch 'mutexRelax_fix' into develop
2015-10-25 22:35:19 +03:00
ArseniyShestakov
44ca00cd16
CPathfinder: rename functions
2015-10-25 19:11:00 +03:00
ArseniyShestakov
a536691781
CPathfinder: fix typos and more code cleanups
2015-10-25 17:01:28 +03:00
Alexander Shishkin
07f99f06ef
Merge pull request #126 from vmarkovtsev/issue/2306
...
Fix typeid ordering bug on MacOSX
2015-10-25 15:47:11 +03:00
DjWarmonger
2a59cb6191
Fixed #2308 - AI didn't attack enemy heroes at all.
2015-10-25 11:55:50 +01:00
DjWarmonger
768b1ca289
More consitent code.
2015-10-25 11:16:43 +01:00
Vadim Markovtsev
79fb5b0c7b
Fix typeid ordering bug on MacOSX
2015-10-25 13:08:59 +03:00
DjWarmonger
87f838f286
AI should poke inaccessible Quest Guards less often.
2015-10-25 08:39:03 +01:00
DjWarmonger
520e42bcd7
Fixed #2317
2015-10-25 08:21:15 +01:00
DjWarmonger
c47c08aa01
Replaced iterators with auto & loop.
2015-10-25 07:07:01 +01:00
AlexVinS
cfb5853689
Just a bit of black magic
2015-10-25 03:29:16 +03:00
AlexVinS
0f9de1c560
Made CTypeList threadsafe
2015-10-25 03:26:48 +03:00
AlexVinS
687a82886f
cleanup CTypeList interface
2015-10-25 01:38:30 +03:00
AlexVinS
92ae56b369
Mingw build fix
2015-10-24 22:21:54 +03:00
DjWarmonger
4e444abf66
Few more uses of cached visibleTiles.
2015-10-24 20:46:55 +02:00
DjWarmonger
63ca9202e4
Reverted old MapHandler::hideObject to avoid weird crash.
2015-10-24 19:03:11 +02:00
DjWarmonger
a6ea0981b6
Merge branch 'develop' into mutexRelax
2015-10-24 18:30:43 +02:00
DjWarmonger
eb0af0096e
Fixed #2072 .
2015-10-24 18:16:57 +02:00
DjWarmonger
61692ba168
Possibly fixed #1583 and other issues concerning players capturing towns.
2015-10-24 18:03:00 +02:00
DjWarmonger
3c4f7ec126
Fixed #2311
2015-10-24 17:15:21 +02:00
DjWarmonger
641aa13526
Some fixes for previous commit.
2015-10-24 17:02:00 +02:00
DjWarmonger
716c324695
Don't give a turn to player who is about to lose (days without town).
2015-10-24 16:21:30 +02:00
DjWarmonger
abe88ea890
- Refactoring legacy code
...
- Some checks for #2311
2015-10-24 15:09:46 +02:00
ArseniyShestakov
4f7c3ec60f
Minor formatting fixes within pathfinder-related code
2015-10-24 15:50:00 +03:00
ArseniyShestakov
939b3c05a1
CPathfinder: use struct instead of enum for options
...
Suggested by @DjWarmonger as better alternative from performance standpoint while struct still more organized than bunch of variables.
Other reason of change it's that in future we may need non-boolean options, e.g for patrol movement and some new pathfinder usages.
2015-10-24 15:34:27 +03:00
ArseniyShestakov
6934c6bc95
CPathfinder: move check into isBetterWay lambda
...
It's must be of course used for teleporters too.
2015-10-24 14:54:15 +03:00
ArseniyShestakov
5a04f05b9b
CPathfinder: move one more check into isMovementPossible
2015-10-24 12:09:57 +03:00
ArseniyShestakov
6ebe2abc1a
Fix penalties for FLYING_MOVEMENT and WATER_WALKING
2015-10-23 20:50:52 +03:00
Ivan Savenko
86e1ae928e
Merge pull request #121 from vmarkovtsev/develop
...
Fix portability issues with vcmibuilder on MacOSX
2015-10-21 19:45:47 +03:00
