1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00

406 Commits

Author SHA1 Message Date
Frank Zago
5eb067e3fd Revert memory mapped support for LOD files (r881, r886 and r895) because on Windows these files get locked and other applications cannot access them anymore. 2009-05-26 04:52:34 +00:00
Michał W. Urbańczyk
4581c30b20 * VCMI won't try to calculate path when clicking terrain on the other map level then that of currently selected hero (caused hangs)
* Mines / Resource Silos won't give income in the first turn
* Double click on hero slot during stack splitting won't crash
* Fixed problems with updating buttons / minimap
2009-05-24 23:21:55 +00:00
mateuszb
d3e5020da1 * fixed #28 bug
* fixed #30 bug (those elementals were wrongly double-wide)
* fixed #40 bug
* RowAdd always initialized in getSprite

bugs from http://antypika.aplus.pl/vcmi/forum/viewtopic.php?t=148&sid=1813b5192666d21ca931aac9ad778606
2009-05-24 14:32:36 +00:00
Frank Zago
6635cf4f23 Made a few functions static or static inline. 2009-05-23 22:57:39 +00:00
Frank Zago
a0417e95c4 Do not return reference to temporary. 2009-05-23 21:16:42 +00:00
Frank Zago
d5bd4d4aaf Optimized (a little) CDefHandler::getSprite. 2009-05-23 04:22:21 +00:00
Frank Zago
e3c3d3478d Simplify infs2. 2009-05-23 01:23:09 +00:00
Frank Zago
8e2a6466e2 Split audioh into soundh and musich. Derive both from a new CAudioBase class. Fixed crash when there is no sound card present. 2009-05-22 04:14:59 +00:00
Michał W. Urbańczyk
1d5565b3a3 * updated project files for MSVC
* fixed a few includes paths
* it's possible to enter Tavern via Brotherhood of Sword
* fixes for statusbar
* fixes for townlist
* fixed crashes on building / clicking some buildings
* bumped version number to 0.71c
* bonuses from wearing more than one same artifact won't cumulate
2009-05-21 23:50:45 +00:00
Frank Zago
73949f3367 Build fixes for linux. 2009-05-21 00:55:30 +00:00
mateuszb
429b226517 * moved a few files 2009-05-20 10:08:56 +00:00
mateuszb
4c0936a3dc * further code reorganization 2009-05-20 09:02:50 +00:00
Michał W. Urbańczyk
7fbd4e696c * Fixed crashbug on iterating stack effects
* Altered probabilities of starting with 1/2/3 stacks (according to Zamolxis tests)
* fix compilation min/max (windef.h is somehow included and it has its own macros min/max)
2009-05-17 22:52:22 +00:00
Frank Zago
0f6bb0d8b0 Use mapped memory for LOD files. Fixed a few bugs. 2009-05-17 20:31:57 +00:00
mateuszb
cc78c2d350 * more of the new stack bonus system 2009-05-15 12:07:55 +00:00
mateuszb
f07c80ce44 * more of the new stack bonus system 2009-05-14 17:26:55 +00:00
Frank Zago
1f337764bd Support for combat spell sounds. 2009-05-14 04:49:04 +00:00
Frank Zago
bbf4394ecc Removed unused variable. 2009-05-14 03:28:55 +00:00
Frank Zago
e7d4635da8 Use the creatures parameter. 2009-05-14 03:13:54 +00:00
mateuszb
a93796e9d8 * a few changes to new stack bonus system 2009-05-13 20:40:23 +00:00
Frank Zago
788343dd1d Typo: cast is an irregular verb. 2009-05-12 03:35:51 +00:00
Frank Zago
a8ebc0fb5b Fix include path. 2009-05-11 04:57:58 +00:00
Frank Zago
4dd4912b81 Unused file. 2009-05-11 00:59:10 +00:00
mateuszb
8a32855900 * further changes in stack's bonus code 2009-05-10 15:09:42 +00:00
Michał W. Urbańczyk
90fd75e66c * Removed trailing newline from settings.txt (caused warning)
* Sprite/Bitmap handlers moved to VCMI_Lib
* Moved volume sliders 1px down for better look
2009-05-09 16:18:27 +00:00
mateuszb
ae2909667d * redesign of stack's abilities and bonuses - not 100% working, but close ;] 2009-05-08 16:55:04 +00:00
mateuszb
b5ae7d5cbe * refactorings and comment coverage improvements 2009-05-07 17:20:41 +00:00
Frank Zago
a594beea92 Added volume support. 2009-05-06 03:13:46 +00:00
Frank Zago
11779956b1 Fix spelling: pickup_sounds -> pickupSounds 2009-05-06 02:39:03 +00:00
Frank Zago
2bb0eab5f9 Split CMusicHandler into CMusicHandler, CSoundHandler and CAudioHandler. Audio handler is now audioh instead of mush. 2009-05-06 02:32:36 +00:00
Michał W. Urbańczyk
ab1a759458 * reduntant quotation marks from artifact descriptions are removed
* fixed map scrolling with ctrl+arrows when some windows are opened
2009-05-03 23:15:18 +00:00
mateuszb
51821ad5c4 * missing change for previous commit 2009-05-03 16:15:22 +00:00
mateuszb
047590427f * support for new hero bonuses (BLOCK_MORALE, SECONDARY_SKILL_PREMY (archery), AIR_SPELL_DMG_PREMY, EARTH_SPELL_DMG_PREMY, FIRE_SPELL_DMG_PREMY, WATER_SPELL_DMG_PREMY, BLOCK_SPELLS_ABOVE_LEVEL, SPELL_IMMUNITY, BLOCK_MORALE, FIRE_SPELLS, AIR_SPELLS, WATER_SPELLS, EARTH_SPELLS, SPELL, SPELLS_OF_LEVEL). It means that following artifacts are now supported:
- Orb of the Firmament
- Orb of Silt
- Orb of Tempestuous Fire
- Orb of Driving Rain
- Bow of Elven Cherrywood
- Bowstring of the Unicorn's Mane
- Angel Feather Arrows
- Tome of Fire Magic
- Tome of Air Magic
- Tome of Water Magic
- Tome of Earth Magic
- Recanter's Cloak
- Orb of Inhibition
- Pendant of Dispassion
- Pendant of Second Sight
- Pendant of Holiness
- Pendant of Life
- Pendant of Death
- Pendant of Free Will
- Pendant of Negativity
- Pendant of Total Recall
- Spellbinder's Hat
- Spirit of Oppression
- Sphere of Permanence
I hope I listed them all here :). Please try them and report if something's wrong.
2009-05-03 16:14:16 +00:00
Michał W. Urbańczyk
1661da2fcb * fixed selecting new path
* always restoring default cursor when movng mouse out of the terrain
* fixed herolist scrolling
* fixed picking guarded resources
2009-05-01 22:08:03 +00:00
Michał W. Urbańczyk
8c6c0df45e Sound patch from Ubuntux #11: Add music infrastruture + some musics in various places
[With mine minor fixes and updated MSVC project]
vcmi_music.diff
2009-04-30 23:25:17 +00:00
Michał W. Urbańczyk
df25dd7efb Sound patches from Ubuntux #7 - #10:
* Some sound code cleanups
* Renamed soundBase::soundNames into soundBase::soundID
* Add a music handler destructor
* Add Archdevil and vampire pre and post movement sounds

I've applied minor change to fix CMusicHandler - GeniusAI conflict: moved sounds bimap to the .cpp file.

(vcmi_sounds_cleanup.diff
vcmi_sounds_cleanup2.diff
vcmi_sounds_cleanup3.diff
vcmi_add_sounds.diff)
2009-04-30 10:53:06 +00:00
Michał W. Urbańczyk
6ccd9c2701 Sound patch from Ubuntux #6 - adds sound to units during combats
(vcmi_sound_battle.diff)
2009-04-25 23:31:39 +00:00
Michał W. Urbańczyk
92671947a0 Sound patch from Ubuntux #5 - fixes a bug in stopSound where all channels would be stopped if -1 is given in parameter.
(vcmi_sound_stop_one_channel.diff)
2009-04-25 22:51:16 +00:00
Michał W. Urbańczyk
275ec5f640 Added sounds to several objects, minor improvements. 2009-04-23 21:09:10 +00:00
Michał W. Urbańczyk
992ce92ae5 Sound patch from Ubuntux #4 - sounds for hero movement
(vcmi_sound_hero_moving.diff)
2009-04-23 19:50:27 +00:00
Michał W. Urbańczyk
a81378617f Little more events
[Still need more work]
2009-04-23 15:48:53 +00:00
Michał W. Urbańczyk
ff131a3b2f Sound patch from Ubuntux #3
(vcmi_sounds_sets.diff)
2009-04-22 18:50:22 +00:00
Michał W. Urbańczyk
ade4b46edd Sound patch from Ubuntux #2
(vcmi_sounds.diff)
2009-04-22 18:48:56 +00:00
Michał W. Urbańczyk
d625066449 Sound patch from Ubuntux #1 2009-04-22 18:28:01 +00:00
mateuszb
d14083272d * new spells
- protection from air
- protection from fire
- protection from water
- protection from earth
* a bit of refactoring in spell handling code
2009-04-22 10:03:13 +00:00
Michał W. Urbańczyk
c8b6858716 * mostly done Events objects handling
* some moving hero code improvements
* fixed Blacksmith
* minor changes
2009-04-20 22:57:07 +00:00
mateuszb
7319e5cb0e * canceling of casting a spell by pressing Escape or R-click (R-click on a creatures does not cancel a spell)
* new spells:
- frost ring
- fireball
- inferno
- meteor shower
- death ripple
- destroy undead
* spellbook button is inactive when hero cannot cast any spell
* obstacles will be placed more properly when resolution is different than 800x600
* minor changes
2009-04-16 14:01:27 +00:00
mateuszb
cc631b1362 * next ubuntux's patch
* normalized line endings (CR+LF)
* translated comments in CMessage.cpp
2009-04-16 11:14:13 +00:00
Michał W. Urbańczyk
d80afb1902 * server sends confirmation (given later to player interface) after applying request (will be needed for AI)
* created new package for injuring multiple units - needed for area spells (not tested)
* proper screen updating on garrison change
* spell effects will be removed when they time out
* Corpse (Skeleton) will be accessible from all directions
* new objects supported:
- Corpse
- Lean To
- Wagon
- Warrior's Tomb

* several minor improvements
2009-04-16 00:28:54 +00:00
mateuszb
f9ae91d88c * further changes towards support for ranged spells
* added info about author & license in files
2009-04-15 14:03:31 +00:00