Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vs 2010 update for deck editor changes as well as SDL update

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2012-01-26 14:54:07 +00:00
parent a2179017d4
commit 85451f69ee
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/src/GameStateDeckViewer.cpp
View File

@@ -1766,7 +1766,7 @@ void GameStateDeckViewer::OnScroll(int inXVelocity, int inYVelocity, int magnitu
offset = 2 + numCards; offset = 2 + numCards;
mEngine->LeftClickedProcessed(); mEngine->LeftClickedProcessed();
mEngine->LeftClicked(cardsCoordinates[offset].first, cardsCoordinates[offset].second); mEngine->LeftClicked(static_cast<int>(cardsCoordinates[offset].first), static_cast<int>(cardsCoordinates[offset].second));
mEngine->HoldKey_NoRepeat(JGE_BTN_OK); mEngine->HoldKey_NoRepeat(JGE_BTN_OK);
} }
else else

4
projects/mtg/src/InteractiveButton.cpp
View File

@@ -68,9 +68,9 @@ void InteractiveButton::Render()
float stringWidth = mainFont->GetStringWidth(detailedInfoString.c_str()); float stringWidth = mainFont->GetStringWidth(detailedInfoString.c_str());
DWORD currentColor = mainFont->GetColor(); DWORD currentColor = mainFont->GetColor();
#ifndef TOUCH_ENABLED #ifndef TOUCH_ENABLED
mXOffset = stringWidth / 2; mXOffset = 5;
mYOffset = 10; mYOffset = 10;
float boxStartX = getX() - mXOffset; float boxStartX = getX() - 5;
float pspIconsSize = 0.5; float pspIconsSize = 0.5;
renderer->FillRoundRect( boxStartX, getY() - 5, stringWidth, mainFont->GetHeight() + 15, .5, ARGB( 255, 0, 0, 0) ); renderer->FillRoundRect( boxStartX, getY() - 5, stringWidth, mainFont->GetHeight() + 15, .5, ARGB( 255, 0, 0, 0) );
if (buttonImage != NULL) if (buttonImage != NULL)

6
projects/mtg/template.vcxproj
View File

@@ -375,6 +375,7 @@
<ClCompile Include="src\GuiPlay.cpp" /> <ClCompile Include="src\GuiPlay.cpp" />
<ClCompile Include="src\GuiStatic.cpp" /> <ClCompile Include="src\GuiStatic.cpp" />
<ClCompile Include="src\IconButton.cpp" /> <ClCompile Include="src\IconButton.cpp" />
<ClCompile Include="src\InteractiveButton.cpp" />
<ClCompile Include="src\ManaCost.cpp" /> <ClCompile Include="src\ManaCost.cpp" />
<ClCompile Include="src\ManaCostHybrid.cpp" /> <ClCompile Include="src\ManaCostHybrid.cpp" />
<ClCompile Include="src\MenuItem.cpp" /> <ClCompile Include="src\MenuItem.cpp" />
@@ -408,6 +409,7 @@
<ClCompile Include="src\PriceList.cpp" /> <ClCompile Include="src\PriceList.cpp" />
<ClCompile Include="src\ReplacementEffects.cpp" /> <ClCompile Include="src\ReplacementEffects.cpp" />
<ClCompile Include="src\Rules.cpp" /> <ClCompile Include="src\Rules.cpp" />
<ClCompile Include="src\SimpleButton.cpp" />
<ClCompile Include="src\SimpleMenu.cpp" /> <ClCompile Include="src\SimpleMenu.cpp" />
<ClCompile Include="src\SimpleMenuItem.cpp" /> <ClCompile Include="src\SimpleMenuItem.cpp" />
<ClCompile Include="src\SimplePad.cpp" /> <ClCompile Include="src\SimplePad.cpp" />
@@ -497,6 +499,7 @@
<ClInclude Include="include\GuiPlay.h" /> <ClInclude Include="include\GuiPlay.h" />
<ClInclude Include="include\GuiStatic.h" /> <ClInclude Include="include\GuiStatic.h" />
<ClInclude Include="include\IconButton.h" /> <ClInclude Include="include\IconButton.h" />
<ClInclude Include="include\InteractiveButton.h"/>
<ClInclude Include="include\Manacost.h" /> <ClInclude Include="include\Manacost.h" />
<ClInclude Include="include\ManaCostHybrid.h" /> <ClInclude Include="include\ManaCostHybrid.h" />
<ClInclude Include="include\MenuItem.h" /> <ClInclude Include="include\MenuItem.h" />
@@ -525,6 +528,7 @@
<ClInclude Include="include\PriceList.h" /> <ClInclude Include="include\PriceList.h" />
<ClInclude Include="include\ReplacementEffects.h" /> <ClInclude Include="include\ReplacementEffects.h" />
<ClInclude Include="include\Rules.h" /> <ClInclude Include="include\Rules.h" />
<ClInclude Include="include\SimpleButton.h" />
<ClInclude Include="include\SimpleMenu.h" /> <ClInclude Include="include\SimpleMenu.h" />
<ClInclude Include="include\SimpleMenuItem.h" /> <ClInclude Include="include\SimpleMenuItem.h" />
<ClInclude Include="include\SimplePad.h" /> <ClInclude Include="include\SimplePad.h" />
@@ -567,4 +571,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

14
projects/mtg/template.vcxproj.filters
View File

@@ -322,6 +322,12 @@
<ClCompile Include="src\AbilityParser.cpp"> <ClCompile Include="src\AbilityParser.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\InteractiveButton.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\SimpleButton.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\ActionElement.h"> <ClInclude Include="include\ActionElement.h">
@@ -660,6 +666,12 @@
<ClInclude Include="include\IconButton.h"> <ClInclude Include="include\IconButton.h">
<Filter>inc</Filter> <Filter>inc</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\InteractiveButton.h">
<Filter>inc</Filter>
</ClInclude>
<ClInclude Include="include\SimpleButton.h">
<Filter>inc</Filter>
</ClInclude>
<ClInclude Include="include\AIPlayerBaka.h"> <ClInclude Include="include\AIPlayerBaka.h">
<Filter>inc</Filter> <Filter>inc</Filter>
</ClInclude> </ClInclude>
@@ -692,4 +704,4 @@
<Filter>res</Filter> <Filter>res</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>