[Scummvm-cvs-logs] SF.net SVN: scummvm:[36328] scummvm/trunk/engines/kyra
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Sat Feb 14 15:33:26 CET 2009
Revision: 36328
http://scummvm.svn.sourceforge.net/scummvm/?rev=36328&view=rev
Author: athrxx
Date: 2009-02-14 14:33:26 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
LOL: fixed a bug in moveParty() and implemented some more gui code
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_lol.cpp
scummvm/trunk/engines/kyra/lol.h
scummvm/trunk/engines/kyra/scene_lol.cpp
Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp 2009-02-14 13:55:00 UTC (rev 36327)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp 2009-02-14 14:33:26 UTC (rev 36328)
@@ -254,6 +254,16 @@
_screen->showMouse();
}
+void LoLEngine::gui_highlightPortraitFrame(int charNum) {
+ if (charNum != _selectedCharacter) {
+ int o = _selectedCharacter;
+ _selectedCharacter = charNum;
+ gui_drawCharPortraitWithStats(o);
+ }
+
+ gui_drawCharPortraitWithStats(charNum);
+}
+
void LoLEngine::gui_drawLiveMagicBar(int x, int y, int curPoints, int unk, int maxPoints, int w, int h, int col1, int col2, int flag) {
w--;
h--;
@@ -728,6 +738,9 @@
}
int LoLEngine::clickedLiveMagicBarsLeft(Button *button) {
+ gui_highlightPortraitFrame(button->data2Val2);
+ _txt->printMessage(0, getLangString(0x4047), _characters[button->data2Val2].name, _characters[button->data2Val2].hitPointsCur,
+ _characters[button->data2Val2].hitPointsMax, _characters[button->data2Val2].magicPointsCur, _characters[button->data2Val2].magicPointsMax);
return 1;
}
Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h 2009-02-14 13:55:00 UTC (rev 36327)
+++ scummvm/trunk/engines/kyra/lol.h 2009-02-14 14:33:26 UTC (rev 36328)
@@ -360,6 +360,7 @@
void gui_drawCharPortraitWithStats(int charNum);
void gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor);
void gui_drawCharFaceShape(int charNum, int x, int y, int pageNum);
+ void gui_highlightPortraitFrame(int charNum);
void gui_drawLiveMagicBar(int x, int y, int curPoints, int unk, int maxPoints, int w, int h, int col1, int col2, int flag);
void gui_drawMoneyBox(int pageNum);
void gui_drawInventory();
Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp 2009-02-14 13:55:00 UTC (rev 36327)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp 2009-02-14 14:33:26 UTC (rev 36328)
@@ -870,7 +870,7 @@
_currentBlock = npos;
_sceneDefaultUpdate = 1;
- calcCoordinates(_partyPosX, _partyPosY, opos, 0x80, 0x80);
+ calcCoordinates(_partyPosX, _partyPosY, _currentBlock, 0x80, 0x80);
_unkFlag &= 0xfdff;
runSceneScript(opos, 4);
@@ -902,11 +902,13 @@
gui_toggleButtonDisplayMode(buttonShape, 0);
- runSceneScript(opos, 8);
- runSceneScript(npos, 2);
+ if (npos == _currentBlock) {
+ runSceneScript(opos, 8);
+ runSceneScript(npos, 2);
- if (_levelBlockProperties[npos].walls[0] == 0x1a)
- memset(_levelBlockProperties[npos].walls, 0, 4);
+ if (_levelBlockProperties[npos].walls[0] == 0x1a)
+ memset(_levelBlockProperties[npos].walls, 0, 4);
+ }
}
setLF2(_currentBlock);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list