games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +02:00
Code Issues Releases Activity

- fixed modifiers keys behaviour in TextInput

Browse Source 
- erm compilation is optional in cmake (too memory-consuming for old systems)
-  minor fixes
This commit is contained in:
Ivan Savenko
2012-08-10 08:49:18 +00:00
parent d3d24d0737
commit d72c44e4c3
7 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -48,5 +48,7 @@ add_subdirectory(lib)
add_subdirectory(client) add_subdirectory(client)
add_subdirectory(server) add_subdirectory(server)
add_subdirectory(AI) add_subdirectory(AI)
add_subdirectory(Scripting/ERM) if (NOT DISABLE_ERM)
add_subdirectory(Scripting/ERM)
endif()

2
client/CAdvmapInterface.cpp
View File

@ -982,7 +982,7 @@ void CAdvMapInt::select(const CArmedInstance *sel, bool centerView /*= true*/)
assert(sel); assert(sel);
LOCPLINT->cb->setSelection(sel); LOCPLINT->cb->setSelection(sel);
selection = sel; selection = sel;
if (LOCPLINT->battleInt == NULL && active & GENERAL) if (LOCPLINT->battleInt == NULL && LOCPLINT->makingTurn)
{ {
auto pos = sel->visitablePos(); auto pos = sel->visitablePos();
auto tile = LOCPLINT->cb->getTile(pos); auto tile = LOCPLINT->cb->getTile(pos);

4
client/CMusicHandler.cpp
View File

@ -410,6 +410,10 @@ void CMusicHandler::playMusicFromSet(std::string whichSet, int entryID, bool loo
tlog0 << "Error: playing non-existing entry " << entryID << " from set: " << whichSet << "\n"; tlog0 << "Error: playing non-existing entry " << entryID << " from set: " << whichSet << "\n";
return; return;
} }
if (current && current->isTrack( selectedEntry->second))
return;
queueNext(new MusicEntry(this, "", selectedEntry->second, loop)); queueNext(new MusicEntry(this, "", selectedEntry->second, loop));
} }

2
client/CVideoHandler.cpp
View File

@ -749,7 +749,7 @@ bool CVideoPlayer::open(std::string fname, bool loop, bool useOverlay)
} }
// Open codec // Open codec
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 17, 0) #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 6, 0)
if ( avcodec_open(codecContext, codec) < 0 ) if ( avcodec_open(codecContext, codec) < 0 )
#else #else
if ( avcodec_open2(codecContext, codec, NULL) < 0 ) if ( avcodec_open2(codecContext, codec, NULL) < 0 )

2
client/GUIClasses.cpp
View File

@ -362,7 +362,7 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
} }
GH.pushInt(new CSplitWindow(owner->highlighted->creature, boost::bind(&CGarrisonInt::splitStacks, owner, _1, _2), GH.pushInt(new CSplitWindow(owner->highlighted->creature, boost::bind(&CGarrisonInt::splitStacks, owner, _1, _2),
minLeft, minRight, count, owner->highlighted->count)); minLeft, minRight, owner->highlighted->count, count));
refr = true; refr = true;
} }
else if(creature != owner->highlighted->creature) //swap else if(creature != owner->highlighted->creature) //swap

5
client/UIFramework/CIntObjectClasses.cpp
View File

@ -1554,7 +1554,10 @@ void CTextInput::keyPressed( const SDL_KeyboardEvent & key )
text.resize(text.size()-1); text.resize(text.size()-1);
break; break;
default: default:
text += key.keysym.unicode; //TODO 16-/>8 if (key.keysym.unicode < ' ')
return;
else
text += key.keysym.unicode; //TODO 16-/>8
break; break;
} }

2
config/buildings.json
View File

@ -722,7 +722,7 @@
{ "id" : 20, "defname" : "TBFRBOAT.def", "x" : 197, "y" : 294, "border" : "TOFDCK1.bmp", "area" : "TZFDCK1.bmp" } { "id" : 20, "defname" : "TBFRBOAT.def", "x" : 197, "y" : 294, "border" : "TOFDCK1.bmp", "area" : "TZFDCK1.bmp" }
], ],
"blit_order" : [ 16, 15, 14, 34, 41, 31, 38, 10, 11, 12, 13, 29, 0, 1, 2, 33, 40, 30, 18, 37, 19, 5, 36, 43, 26 ], "blit_order" : [ 16, 15, 14, 34, 41, 31, 38, 10, 11, 12, 13, 29, 0, 1, 2, 33, 40, 30, 18, 37, 19, 5, 36, 43, 26 ],
"creatures" : [ [98, 99], [100, 101], [102, 103], [104, 105], [106, 107], [108, 109], [110, 111] ], "creatures" : [ [98, 99], [100, 101], [104, 105], [106, 107], [102, 103], [108, 109], [110, 111] ],
"horde" : [ 0, null ], "horde" : [ 0, null ],
"mage_guild" : 3, "mage_guild" : 3,
"war_machine" : 6, "war_machine" : 6,