1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-29 00:41:38 +02:00
Commit Graph

4220 Commits

Author SHA1 Message Date
60ee0e1a3c Better fix for #128 2011-06-18 09:48:25 +00:00
a497c88bde Fixed #128 and #301 2011-06-18 05:55:39 +00:00
4b7d0f3092 Partial integration of Android patches, from Pelya. 2011-06-15 02:15:05 +00:00
14efb9fd13 Warning fix. 2011-06-15 01:36:36 +00:00
3e9b247470 * defining functions in verm works
* a few more standard functions
* standard verm file
2011-06-14 17:29:13 +00:00
b471c10149 Compile fix, from Pelya. 2011-06-14 13:22:00 +00:00
73a05d62fd * significantly improved verm interpreter - if, comparisons, lambda expressions are working! 2011-06-11 18:10:15 +00:00
9775f88045 Version bump.
Initial support for IF:M elements and string formatting.
Various minor changes related to ERM interpreter.

The following script should be functional now:
ZVSE
!?PI;
!!DO1/0/6/1&v2777<>1:P0;

!?FU1;
!!IF:M^Hello world number %X16!^;
2011-06-10 23:50:32 +00:00
78b5e11b93 Compile fix. 2011-06-10 12:49:31 +00:00
af3050058f * some work on interpreter 2011-06-04 18:16:32 +00:00
aca118b613 Fixed creature bonus parser. Fixed several uninitialized variables. Updated data build script to v0.85. 2011-06-03 03:23:50 +00:00
0dbd7ee3c8 Fixed #739 and #742.
Version set to 0.85.
2011-06-01 18:26:44 +00:00
f4f2af664f Fixed #744 2011-06-01 05:10:28 +00:00
ff49b852df Silenced several "warning: suggest parentheses around ‘&&’ within ‘||’": added some parenthesis, optimized a couple statments and fix a bug in another. 2011-05-30 19:20:14 +00:00
2d61fab7e9 * Probably fixed #655.
* Fixed #736, #737.
* Fixed crash on loss/victory.
* Fixed crash on loading some AB maps.
* Fixed crash on loading map where victory/loss condition objective hero was placed inside the town.
* Fixed crash on loading map when neutral Dungeon has built Portal of Summoning.
* Mutex protecting GS will be used to prevent changes in GS when GUI might read it.
* Little more securities around moving hero and ending turn, still needed more.
2011-05-29 23:49:25 +00:00
936005aa1c Correct, yet ugly handling of Magic Resistance. 2011-05-29 18:28:50 +00:00
5786c26586 * building verm tree without modifiers 2011-05-29 18:16:49 +00:00
47e4c8d6e6 Probably fixed #732, one more fix for spawning wandering monsters. 2011-05-29 14:06:52 +00:00
7d56db6fb3 Fixed #597 once more. 2011-05-29 13:34:26 +00:00
968080a890 Fixed #734 2011-05-29 12:36:38 +00:00
c6a69d35cf More bonuses & graphics handled. 2011-05-28 05:34:40 +00:00
b11981293f Compile fix. 2011-05-28 05:09:06 +00:00
3ca95ef5ed Fixed #730:
* crash on +5 growth week 
* crash on spawning wandering creatures on double growth months
(how come that has not been found in previous build?)

More logging for #729-like issues.
2011-05-28 01:02:28 +00:00
4af4f0a707 Compile and warning fixes. 2011-05-27 22:34:58 +00:00
abc0d3537e Some compile fixes. 2011-05-27 13:49:18 +00:00
953a3bf165 Final changes for 0.84b:
* no hard crash on startup when AB videos are not installed (1 byte file)
* moved some DLL_EXPORTs to resolve incomprehensible (to me) linker error occurring only with release builds.
2011-05-26 01:03:35 +00:00
c32242b4e9 For 0.84b dev build. 2011-05-25 23:52:27 +00:00
528f0363a1 Fixed crash after a battle when resurrection was cast.
[However the spell still is not implemented correctly... :/ ]
2011-05-25 20:44:18 +00:00
d4ed4cf9a0 Minor fix.
A general issue: "shooter" artifacts should display bonus only for shooting creatures.
2011-05-25 18:12:26 +00:00
8e57dba850 Fixed #658 and #699.
Checking for water availability won't cause spurious warnings. New creature window enabled for testing.
2011-05-25 14:48:49 +00:00
072bb5884b Fixed #728.
Fixed issue with game loading.
Minor fixes.
2011-05-24 23:17:57 +00:00
94166b83aa * some changes 2011-05-22 18:46:52 +00:00
0adc4235f2 Display of immunities and similar effects. 2011-05-21 16:10:14 +00:00
3a6b5cbfbb Various fixes related to spell effects and Creature Window. 2011-05-21 07:07:07 +00:00
431064cbf9 * Fixed #532 -> Catapult shoots now after keep/upper/lower tower
* Fixed turret projectile bug
2011-05-18 17:51:10 +00:00
53ce30f083 * partial support for string processing
* post-triggers should work
* minor improvements
2011-05-17 19:24:18 +00:00
6014edb7ea * minor improvements in parser/interpreter 2011-05-16 12:11:00 +00:00
4eef7aa83b * partially done OB receiver
* minor structure imprevements
2011-05-15 18:21:07 +00:00
d4c2e55a00 Fixed #421 & #480. Some work on animations & sounds. Minor changes.
TODO: Interface should check game state before it's changed by triggered abilities of creatures.
2011-05-15 06:37:57 +00:00
249977af2f Various fixes and improvements for ERM:
* comparisons need to have comparison operator -> they won't catch plain var usage
* removed qmacro -> that's just reading into normal macro
* there are 10000 standard vars
* there is one global (base) set of y-vars
* the iterator from !!DO loop is correctly passed into called function
* fixed getting variable value (also supporting array indexing)

* post- and pre-triggers share common base
2011-05-14 13:20:19 +00:00
bc114a89f4 Partial support for immunities & receptive ability.
TODO: Immunity to direct damage spells.
2011-05-13 17:51:12 +00:00
db386915d1 Spell_levels are not necessary in the end.
Fixes. Game won't crash when displaying info for war machines. However, they should be handled as regular stacks during battle.
2011-05-13 14:33:48 +00:00
b02527566c Fixed some battle logs. 2011-05-13 10:45:36 +00:00
515ab7e7c1 Support for Acid Breath (both effects are now separate).
Minor fixes.
2011-05-13 09:02:16 +00:00
09a51acfc2 * minor bugfix
* a bit more of function handling
2011-05-12 20:49:37 +00:00
2bcba53a5d (linux) compile fix. 2011-05-12 01:39:37 +00:00
95b16906aa * a few bugs in interpreter fixed 2011-05-11 19:53:55 +00:00
c165593896 (linux) added new files into the makefiles and compile fixes. 2011-05-10 01:15:10 +00:00
58ebfc421d One more file:
* lib/IGameEventsReceiver.h

Workaround for crash on post-visit.
2011-05-09 22:30:37 +00:00
617e1f962e New files for lib:
* lib/ERMScriptModule.cpp
* lib/ERMScriptModule.h
* lib/CObstacleInstance.h

More jugglery with callbacks. Moving stuff from CGameState to CGameInfoCallback. Work on unified game events interface for player (AI or GUI) and script module. Directing events to ERM interpretetr, first attempts of calling some triggers. Crashy, if there any scripts.
Some other changes, including fighting amount of includes in includes and tracking of hero visits (need further work).
2011-05-09 22:20:47 +00:00