Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. v0.6.2-298-g776dcb2
|
From: Jaka K. <lyn...@us...> - 2010-10-29 19:14:42
|
gemrb: Infinity Engine emulator
The branch master has been updated
via 776dcb292c284692e0539f5fa40efb6fb62083db (commit)
via 5a2a4db2c8e6f6f3be3ea37aa23ee9d59bb3bcdf (commit)
Summary of changes:
gemrb/core/Scriptable/Actor.cpp | 4 +-
gemrb/override/bg1/qslots.2da | 44 +++++++++++++++++++-------------------
gemrb/override/bg2/qslots.2da | 44 +++++++++++++++++++-------------------
gemrb/override/how/qslots.2da | 44 +++++++++++++++++++-------------------
gemrb/override/iwd/qslots.2da | 44 +++++++++++++++++++-------------------
5 files changed, 90 insertions(+), 90 deletions(-)
from 4b669641c5c70aba2e5778b1aa452cb2657cf68e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=776dcb292c284692e0539f5fa40efb6fb62083db
commit 776dcb292c284692e0539f5fa40efb6fb62083db
Author: Jaka Kranjc <lyn...@us...>
Date: Fri Oct 29 21:18:51 2010 +0200
changed the default action row to match bg2
diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index ddbf2a8..b2b44ec 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -176,8 +176,8 @@ static unsigned int monkbon_rows = 0;
static ActionButtonRow *GUIBTDefaults = NULL; //qslots row count
static ActionButtonRow2 *OtherGUIButtons = NULL;
ActionButtonRow DefaultButtons = {ACT_TALK, ACT_WEAPON1, ACT_WEAPON2,
- ACT_NONE, ACT_NONE, ACT_NONE, ACT_NONE, ACT_NONE, ACT_NONE, ACT_NONE,
- ACT_NONE, ACT_INNATE};
+ ACT_QSPELL1, ACT_QSPELL2, ACT_QSPELL3, ACT_CAST, ACT_USE, ACT_QSLOT1, ACT_QSLOT2,
+ ACT_QSLOT3, ACT_INNATE};
static int QslotTranslation = false;
static int DeathOnZeroStat = true;
static ieDword TranslucentShadows = 0;
diff --git a/gemrb/override/bg2/qslots.2da b/gemrb/override/bg2/qslots.2da
index c9fc3d2..ee67138 100644
--- a/gemrb/override/bg2/qslots.2da
+++ b/gemrb/override/bg2/qslots.2da
@@ -1,7 +1,7 @@
2DA V1.0
100
SLOT1 SLOT2 SLOT3 SLOT4 SLOT5 SLOT6 SLOT7 SLOT8 SLOT9
-DEFAULT 18 19 14 100 8 9 11 12 13
+DEFAULT 3 4 5 2 8 9 11 12 13
MAGE 3 4 5 2 8 9 11 12 13
FIGHTER 18 19 14 100 8 9 11 12 13
CLERIC 6 3 4 2 8 9 11 12 13
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=5a2a4db2c8e6f6f3be3ea37aa23ee9d59bb3bcdf
commit 5a2a4db2c8e6f6f3be3ea37aa23ee9d59bb3bcdf
Author: Jaka Kranjc <lyn...@us...>
Date: Fri Oct 29 19:35:28 2010 +0200
qslots.2da, cosmetic: fixed spacing for easier reading for humans
diff --git a/gemrb/override/bg1/qslots.2da b/gemrb/override/bg1/qslots.2da
index df0474e..c9fc3d2 100644
--- a/gemrb/override/bg1/qslots.2da
+++ b/gemrb/override/bg1/qslots.2da
@@ -1,24 +1,24 @@
2DA V1.0
100
- SLOT1 SLOT2 SLOT3 SLOT4 SLOT5 SLOT6 SLOT7 SLOT8 SLOT9
-DEFAULT 18 19 14 100 8 9 11 12 13
-MAGE 3 4 5 2 8 9 11 12 13
-FIGHTER 18 19 14 100 8 9 11 12 13
-CLERIC 6 3 4 2 8 9 11 12 13
-THIEF 22 0 1 100 8 9 11 12 13
-BARD 20 1 3 2 8 9 11 12 13
-PALADIN 18 14 6 2 8 9 11 12 13
-FIGHTER_MAGE 3 4 5 2 8 9 11 12 13
-FIGHTER_CLERIC 6 3 4 2 8 9 11 12 13
-FIGHTER_THIEF 18 22 0 1 8 9 11 12 13
-FIGHTER_MAGE_THIEF 22 0 1 2 8 9 11 12 13
-DRUID 3 4 5 2 8 9 11 12 13
-RANGER 18 14 0 2 8 9 11 12 13
-MAGE_THIEF 22 0 1 2 8 9 11 12 13
-CLERIC_MAGE 6 3 4 2 8 9 11 12 13
-CLERIC_THIEF 22 0 1 2 8 9 11 12 13
-FIGHTER_DRUID 3 4 5 2 8 9 11 12 13
-FIGHTER_MAGE_CLERIC 6 3 4 2 8 9 11 12 13
-CLERIC_RANGER 6 3 4 2 8 9 11 12 13
-SORCERER 3 4 5 2 8 9 11 12 13
-MONK 18 14 22 0 8 9 11 12 13
+ SLOT1 SLOT2 SLOT3 SLOT4 SLOT5 SLOT6 SLOT7 SLOT8 SLOT9
+DEFAULT 18 19 14 100 8 9 11 12 13
+MAGE 3 4 5 2 8 9 11 12 13
+FIGHTER 18 19 14 100 8 9 11 12 13
+CLERIC 6 3 4 2 8 9 11 12 13
+THIEF 22 0 1 100 8 9 11 12 13
+BARD 20 1 3 2 8 9 11 12 13
+PALADIN 18 14 6 2 8 9 11 12 13
+FIGHTER_MAGE 3 4 5 2 8 9 11 12 13
+FIGHTER_CLERIC 6 3 4 2 8 9 11 12 13
+FIGHTER_THIEF 18 22 0 1 8 9 11 12 13
+FIGHTER_MAGE_THIEF 22 0 1 2 8 9 11 12 13
+DRUID 3 4 5 2 8 9 11 12 13
+RANGER 18 14 0 2 8 9 11 12 13
+MAGE_THIEF 22 0 1 2 8 9 11 12 13
+CLERIC_MAGE 6 3 4 2 8 9 11 12 13
+CLERIC_THIEF 22 0 1 2 8 9 11 12 13
+FIGHTER_DRUID 3 4 5 2 8 9 11 12 13
+FIGHTER_MAGE_CLERIC 6 3 4 2 8 9 11 12 13
+CLERIC_RANGER 6 3 4 2 8 9 11 12 13
+SORCERER 3 4 5 2 8 9 11 12 13
+MONK 18 14 22 0 8 9 11 12 13
diff --git a/gemrb/override/bg2/qslots.2da b/gemrb/override/bg2/qslots.2da
index df0474e..c9fc3d2 100644
--- a/gemrb/override/bg2/qslots.2da
+++ b/gemrb/override/bg2/qslots.2da
@@ -1,24 +1,24 @@
2DA V1.0
100
- SLOT1 SLOT2 SLOT3 SLOT4 SLOT5 SLOT6 SLOT7 SLOT8 SLOT9
-DEFAULT 18 19 14 100 8 9 11 12 13
-MAGE 3 4 5 2 8 9 11 12 13
-FIGHTER 18 19 14 100 8 9 11 12 13
-CLERIC 6 3 4 2 8 9 11 12 13
-THIEF 22 0 1 100 8 9 11 12 13
-BARD 20 1 3 2 8 9 11 12 13
-PALADIN 18 14 6 2 8 9 11 12 13
-FIGHTER_MAGE 3 4 5 2 8 9 11 12 13
-FIGHTER_CLERIC 6 3 4 2 8 9 11 12 13
-FIGHTER_THIEF 18 22 0 1 8 9 11 12 13
-FIGHTER_MAGE_THIEF 22 0 1 2 8 9 11 12 13
-DRUID 3 4 5 2 8 9 11 12 13
-RANGER 18 14 0 2 8 9 11 12 13
-MAGE_THIEF 22 0 1 2 8 9 11 12 13
-CLERIC_MAGE 6 3 4 2 8 9 11 12 13
-CLERIC_THIEF 22 0 1 2 8 9 11 12 13
-FIGHTER_DRUID 3 4 5 2 8 9 11 12 13
-FIGHTER_MAGE_CLERIC 6 3 4 2 8 9 11 12 13
-CLERIC_RANGER 6 3 4 2 8 9 11 12 13
-SORCERER 3 4 5 2 8 9 11 12 13
-MONK 18 14 22 0 8 9 11 12 13
+ SLOT1 SLOT2 SLOT3 SLOT4 SLOT5 SLOT6 SLOT7 SLOT8 SLOT9
+DEFAULT 18 19 14 100 8 9 11 12 13
+MAGE 3 4 5 2 8 9 11 12 13
+FIGHTER 18 19 14 100 8 9 11 12 13
+CLERIC 6 3 4 2 8 9 11 12 13
+THIEF 22 0 1 100 8 9 11 12 13
+BARD 20 1 3 2 8 9 11 12 13
+PALADIN 18 14 6 2 8 9 11 12 13
+FIGHTER_MAGE 3 4 5 2 8 9 11 12 13
+FIGHTER_CLERIC 6 3 4 2 8 9 11 12 13
+FIGHTER_THIEF 18 22 0 1 8 9 11 12 13
+FIGHTER_MAGE_THIEF 22 0 1 2 8 9 11 12 13
+DRUID 3 4 5 2 8 9 11 12 13
+RANGER 18 14 0 2 8 9 11 12 13
+MAGE_THIEF 22 0 1 2 8 9 11 12 13
+CLERIC_MAGE 6 3 4 2 8 9 11 12 13
+CLERIC_THIEF 22 0 1 2 8 9 11 12 13
+FIGHTER_DRUID 3 4 5 2 8 9 11 12 13
+FIGHTER_MAGE_CLERIC 6 3 4 2 8 9 11 12 13
+CLERIC_RANGER 6 3 4 2 8 9 11 12 13
+SORCERER 3 4 5 2 8 9 11 12 13
+MONK 18 14 22 0 8 9 11 12 13
diff --git a/gemrb/override/how/qslots.2da b/gemrb/override/how/qslots.2da
index df0474e..c9fc3d2 100644
--- a/gemrb/override/how/qslots.2da
+++ b/gemrb/override/how/qslots.2da
@@ -1,24 +1,24 @@
2DA V1.0
100
- SLOT1 SLOT2 SLOT3 SLOT4 SLOT5 SLOT6 SLOT7 SLOT8 SLOT9
-DEFAULT 18 19 14 100 8 9 11 12 13
-MAGE 3 4 5 2 8 9 11 12 13
-FIGHTER 18 19 14 100 8 9 11 12 13
-CLERIC 6 3 4 2 8 9 11 12 13
-THIEF 22 0 1 100 8 9 11 12 13
-BARD 20 1 3 2 8 9 11 12 13
-PALADIN 18 14 6 2 8 9 11 12 13
-FIGHTER_MAGE 3 4 5 2 8 9 11 12 13
-FIGHTER_CLERIC 6 3 4 2 8 9 11 12 13
-FIGHTER_THIEF 18 22 0 1 8 9 11 12 13
-FIGHTER_MAGE_THIEF 22 0 1 2 8 9 11 12 13
-DRUID 3 4 5 2 8 9 11 12 13
-RANGER 18 14 0 2 8 9 11 12 13
-MAGE_THIEF 22 0 1 2 8 9 11 12 13
-CLERIC_MAGE 6 3 4 2 8 9 11 12 13
-CLERIC_THIEF 22 0 1 2 8 9 11 12 13
-FIGHTER_DRUID 3 4 5 2 8 9 11 12 13
-FIGHTER_MAGE_CLERIC 6 3 4 2 8 9 11 12 13
-CLERIC_RANGER 6 3 4 2 8 9 11 12 13
-SORCERER 3 4 5 2 8 9 11 12 13
-MONK 18 14 22 0 8 9 11 12 13
+ SLOT1 SLOT2 SLOT3 SLOT4 SLOT5 SLOT6 SLOT7 SLOT8 SLOT9
+DEFAULT 18 19 14 100 8 9 11 12 13
+MAGE 3 4 5 2 8 9 11 12 13
+FIGHTER 18 19 14 100 8 9 11 12 13
+CLERIC 6 3 4 2 8 9 11 12 13
+THIEF 22 0 1 100 8 9 11 12 13
+BARD 20 1 3 2 8 9 11 12 13
+PALADIN 18 14 6 2 8 9 11 12 13
+FIGHTER_MAGE 3 4 5 2 8 9 11 12 13
+FIGHTER_CLERIC 6 3 4 2 8 9 11 12 13
+FIGHTER_THIEF 18 22 0 1 8 9 11 12 13
+FIGHTER_MAGE_THIEF 22 0 1 2 8 9 11 12 13
+DRUID 3 4 5 2 8 9 11 12 13
+RANGER 18 14 0 2 8 9 11 12 13
+MAGE_THIEF 22 0 1 2 8 9 11 12 13
+CLERIC_MAGE 6 3 4 2 8 9 11 12 13
+CLERIC_THIEF 22 0 1 2 8 9 11 12 13
+FIGHTER_DRUID 3 4 5 2 8 9 11 12 13
+FIGHTER_MAGE_CLERIC 6 3 4 2 8 9 11 12 13
+CLERIC_RANGER 6 3 4 2 8 9 11 12 13
+SORCERER 3 4 5 2 8 9 11 12 13
+MONK 18 14 22 0 8 9 11 12 13
diff --git a/gemrb/override/iwd/qslots.2da b/gemrb/override/iwd/qslots.2da
index df0474e..c9fc3d2 100644
--- a/gemrb/override/iwd/qslots.2da
+++ b/gemrb/override/iwd/qslots.2da
@@ -1,24 +1,24 @@
2DA V1.0
100
- SLOT1 SLOT2 SLOT3 SLOT4 SLOT5 SLOT6 SLOT7 SLOT8 SLOT9
-DEFAULT 18 19 14 100 8 9 11 12 13
-MAGE 3 4 5 2 8 9 11 12 13
-FIGHTER 18 19 14 100 8 9 11 12 13
-CLERIC 6 3 4 2 8 9 11 12 13
-THIEF 22 0 1 100 8 9 11 12 13
-BARD 20 1 3 2 8 9 11 12 13
-PALADIN 18 14 6 2 8 9 11 12 13
-FIGHTER_MAGE 3 4 5 2 8 9 11 12 13
-FIGHTER_CLERIC 6 3 4 2 8 9 11 12 13
-FIGHTER_THIEF 18 22 0 1 8 9 11 12 13
-FIGHTER_MAGE_THIEF 22 0 1 2 8 9 11 12 13
-DRUID 3 4 5 2 8 9 11 12 13
-RANGER 18 14 0 2 8 9 11 12 13
-MAGE_THIEF 22 0 1 2 8 9 11 12 13
-CLERIC_MAGE 6 3 4 2 8 9 11 12 13
-CLERIC_THIEF 22 0 1 2 8 9 11 12 13
-FIGHTER_DRUID 3 4 5 2 8 9 11 12 13
-FIGHTER_MAGE_CLERIC 6 3 4 2 8 9 11 12 13
-CLERIC_RANGER 6 3 4 2 8 9 11 12 13
-SORCERER 3 4 5 2 8 9 11 12 13
-MONK 18 14 22 0 8 9 11 12 13
+ SLOT1 SLOT2 SLOT3 SLOT4 SLOT5 SLOT6 SLOT7 SLOT8 SLOT9
+DEFAULT 18 19 14 100 8 9 11 12 13
+MAGE 3 4 5 2 8 9 11 12 13
+FIGHTER 18 19 14 100 8 9 11 12 13
+CLERIC 6 3 4 2 8 9 11 12 13
+THIEF 22 0 1 100 8 9 11 12 13
+BARD 20 1 3 2 8 9 11 12 13
+PALADIN 18 14 6 2 8 9 11 12 13
+FIGHTER_MAGE 3 4 5 2 8 9 11 12 13
+FIGHTER_CLERIC 6 3 4 2 8 9 11 12 13
+FIGHTER_THIEF 18 22 0 1 8 9 11 12 13
+FIGHTER_MAGE_THIEF 22 0 1 2 8 9 11 12 13
+DRUID 3 4 5 2 8 9 11 12 13
+RANGER 18 14 0 2 8 9 11 12 13
+MAGE_THIEF 22 0 1 2 8 9 11 12 13
+CLERIC_MAGE 6 3 4 2 8 9 11 12 13
+CLERIC_THIEF 22 0 1 2 8 9 11 12 13
+FIGHTER_DRUID 3 4 5 2 8 9 11 12 13
+FIGHTER_MAGE_CLERIC 6 3 4 2 8 9 11 12 13
+CLERIC_RANGER 6 3 4 2 8 9 11 12 13
+SORCERER 3 4 5 2 8 9 11 12 13
+MONK 18 14 22 0 8 9 11 12 13
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|