[Scummvm-cvs-logs] SF.net SVN: scummvm: [29166] scummvm/trunk/engines/lure/fights.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Oct 7 13:07:45 CEST 2007


Revision: 29166
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29166&view=rev
Author:   dreammaster
Date:     2007-10-07 04:07:45 -0700 (Sun, 07 Oct 2007)

Log Message:
-----------
Replaced incorrect key constants being used for fight commands

Modified Paths:
--------------
    scummvm/trunk/engines/lure/fights.cpp

Modified: scummvm/trunk/engines/lure/fights.cpp
===================================================================
--- scummvm/trunk/engines/lure/fights.cpp	2007-10-07 11:06:48 UTC (rev 29165)
+++ scummvm/trunk/engines/lure/fights.cpp	2007-10-07 11:07:45 UTC (rev 29166)
@@ -72,7 +72,7 @@
 	player->resource()->colourOffset = 16;
 	player->setTickProc(PLAYER_FIGHT_TICK_PROC_ID);
 	player->setSize(48, 53);
-	player->setAnimation(PLAYER_FIGHT_ANIM_ID);
+	player->setAnimationIndex(PLAYER_FIGHT_ANIM_INDEX);
 	player->resource()->width = 48;
 	player->resource()->height = 53;
 
@@ -159,8 +159,10 @@
 };
 
 const KeyMapping keyList[] = {
-	{Common::KEYCODE_LEFT, 10}, {Common::KEYCODE_RIGHT, 14}, {Common::KEYCODE_7, 11}, {Common::KEYCODE_4, 12}, 
-	{Common::KEYCODE_1, 13}, {Common::KEYCODE_9, 6}, {Common::KEYCODE_6, 7}, {Common::KEYCODE_3, 8}, {Common::KEYCODE_INVALID, 0}};
+	{Common::KEYCODE_LEFT, 10}, {Common::KEYCODE_RIGHT, 14}, 
+	{Common::KEYCODE_KP7, 11}, {Common::KEYCODE_KP4, 12}, {Common::KEYCODE_KP1, 13}, 
+	{Common::KEYCODE_KP9, 6},  {Common::KEYCODE_KP6, 7},  {Common::KEYCODE_KP3, 8}, 
+	{Common::KEYCODE_INVALID, 0}};
 
 void FightsManager::checkEvents() {
 	Events &events = Events::getReference();
@@ -556,7 +558,7 @@
 	playerHotspot->setSize(32, 48);
 	playerHotspot->resource()->width = 32;
 	playerHotspot->resource()->height = 48;
-	playerHotspot->setAnimation(PLAYER_ANIM_ID);
+	playerHotspot->setAnimationIndex(PLAYER_ANIM_INDEX);
 	playerHotspot->setPosition(playerHotspot->x(), playerHotspot->y() + 5);
 	playerHotspot->setDirection(LEFT);
 	


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