[Sphere-axis-commits] CVS: Axis axis_enu.xml,1.6,1.7 itemgentab.cpp,1.24,1.25
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: Axis axis_enu.xml,1.6,1.7 itemgentab.cpp,1.24,1.25
|
From: Philip E. <pes...@us...> - 2003-07-24 06:00:08
|
Update of /cvsroot/sphere-axis/Axis
In directory sc8-pr-cvs1:/tmp/cvs-serv11511
Modified Files:
axis_enu.xml itemgentab.cpp
Log Message:
no message
Index: axis_enu.xml
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/axis_enu.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** axis_enu.xml 21 Jul 2003 14:13:56 -0000 1.6
--- axis_enu.xml 24 Jul 2003 06:00:04 -0000 1.7
***************
*** 505,565 ****
</Dialog>
<Dialog ID="151" Caption="NPC Editor">
! <Item ID="1335" type="COMBOBOX" geometry="47,7,154,157"></Item>
! <Item ID="1003" type="PUSHBUTTON" geometry="204,7,44,12">"New"</Item>
! <Item ID="1004" type="PUSHBUTTON" geometry="251,7,44,12">"Edit"</Item>
! <Item ID="1005" type="PUSHBUTTON" geometry="298,7,44,12">"Apply Edits"</Item>
! <Item ID="1006" type="PUSHBUTTON" geometry="345,7,44,12">"Cancel Edits"</Item>
! <Item ID="1059" type="EDITTEXT" geometry="71,30,102,14"></Item>
! <Item ID="1339" type="COMBOBOX" geometry="71,46,102,52"></Item>
! <Item ID="1340" type="COMBOBOX" geometry="71,61,102,57"></Item>
! <Item ID="1341" type="COMBOBOX" geometry="71,75,102,60"></Item>
! <Item ID="1342" type="COMBOBOX" geometry="71,90,86,49"></Item>
! <Item ID="1008" type="PUSHBUTTON" geometry="160,90,13,13">""</Item>
! <Item ID="1210" type="COMBOBOX" geometry="71,105,102,51"></Item>
! <Item ID="1345" type="COMBOBOX" geometry="71,121,102,53"></Item>
! <Item ID="1060" type="EDITTEXT" geometry="71,135,102,14"></Item>
! <Item ID="1062" type="EDITTEXT" geometry="71,150,102,14"></Item>
! <Item ID="1063" type="EDITTEXT" geometry="71,165,102,14"></Item>
! <Item ID="1064" type="EDITTEXT" geometry="71,180,102,14"></Item>
! <Item ID="1337" type="CONTROL" geometry="178,32,114,58">"List5"</Item>
! <Item ID="1061" type="CONTROL" geometry="178,95,114,99">"List6"</Item>
! <Item ID="1035" type="CONTROL" geometry="437,116,41,24">"No Axis index"</Item>
! <Item ID="1221" type="COMBOBOX" geometry="342,150,122,52"></Item>
! <Item ID="1007" type="PUSHBUTTON" geometry="465,150,18,12">"Add"</Item>
! <Item ID="1222" type="COMBOBOX" geometry="342,165,122,59"></Item>
! <Item ID="1009" type="PUSHBUTTON" geometry="465,165,18,12">"Add"</Item>
! <Item ID="1347" type="EDITTEXT" geometry="342,180,141,12"></Item>
! <Item ID="1343" type="CONTROL" geometry="79,217,100,112">"Tree1"</Item>
! <Item ID="1032" type="CONTROL" geometry="290,217,191,97">"List2"</Item>
! <Item ID="1334" type="EDITTEXT" geometry="321,317,33,12"></Item>
! <Item ID="1001" type="PUSHBUTTON" geometry="407,317,35,12">"Add"</Item>
! <Item ID="1002" type="PUSHBUTTON" geometry="444,317,35,12">"Remove"</Item>
! <Item ID="1349" type="CONTROL" geometry="437,42,37,20">"Disable Display"</Item>
<Item ID="1" type="DEFPUSHBUTTON" geometry="437,7,50,14">"OK"</Item>
<Item ID="2" type="PUSHBUTTON" geometry="437,24,50,14">"Cancel"</Item>
! <Item ID="1526" type="GROUPBOX" geometry="299,139,188,60">"Axis Classification"</Item>
! <Item ID="1523" type="LTEXT" geometry="7,9,34,8">"NPC Entry"</Item>
! <Item ID="1524" type="GROUPBOX" geometry="7,23,290,176">"Attributes"</Item>
! <Item ID="1527" type="LTEXT" geometry="14,33,20,8">"Name"</Item>
! <Item ID="1528" type="LTEXT" geometry="14,48,39,8">"Name Index"</Item>
! <Item ID="1529" type="LTEXT" geometry="14,63,22,8">"Sound"</Item>
! <Item ID="1532" type="LTEXT" geometry="14,108,45,8">"Tracking Icon"</Item>
! <Item ID="1533" type="LTEXT" geometry="14,123,17,8">"Brain"</Item>
! <Item ID="1534" type="LTEXT" geometry="14,138,31,8">"DefName"</Item>
! <Item ID="1535" type="LTEXT" geometry="14,153,24,8">"Desires"</Item>
! <Item ID="1536" type="LTEXT" geometry="14,168,45,8">"Basic Speech"</Item>
! <Item ID="1537" type="LTEXT" geometry="14,183,42,8">"Basic Events"</Item>
! <Item ID="1530" type="LTEXT" geometry="14,78,46,8">"Creature Base"</Item>
! <Item ID="1531" type="LTEXT" geometry="14,93,21,8">"Colour"</Item>
! <Item ID="1525" type="GROUPBOX" geometry="7,199,480,135">"Miscellaneous Attributes"</Item>
! <Item ID="1538" type="LTEXT" geometry="14,208,30,8">"Attributes"</Item>
! <Item ID="1539" type="LTEXT" geometry="79,208,34,8">"Categories"</Item>
! <Item ID="1540" type="LTEXT" geometry="182,208,103,8">"Choices\t\t(D-Click to Add)"</Item>
! <Item ID="1541" type="LTEXT" geometry="290,208,189,8">"Selections\t\t\t\t(D-Click to Edit)"</Item>
! <Item ID="1545" type="LTEXT" geometry="292,319,25,8">"Amount"</Item>
! <Item ID="1542" type="LTEXT" geometry="304,152,29,8">"Category"</Item>
! <Item ID="1543" type="LTEXT" geometry="304,167,36,8">"Subsection"</Item>
! <Item ID="1544" type="LTEXT" geometry="304,182,36,8">"Description"</Item>
! <Item ID="1348" type="CONTROL" geometry="300,27,124,110">""</Item>
</Dialog>
<Dialog ID="152" Caption="Edit Skill/Stat Values">
--- 505,561 ----
</Dialog>
<Dialog ID="151" Caption="NPC Editor">
! <Item ID="1003" type="PUSHBUTTON" geometry="437,45,50,14">"New"</Item>
! <Item ID="1004" type="PUSHBUTTON" geometry="437,58,50,14">"Edit"</Item>
! <Item ID="1005" type="PUSHBUTTON" geometry="437,71,50,14">"Apply Edits"</Item>
! <Item ID="1006" type="PUSHBUTTON" geometry="437,85,50,14">"Cancel Edits"</Item>
! <Item ID="1059" type="EDITTEXT" geometry="71,106,102,14"></Item>
! <Item ID="1339" type="COMBOBOX" geometry="71,122,102,52"></Item>
! <Item ID="1340" type="COMBOBOX" geometry="71,137,102,57"></Item>
! <Item ID="1341" type="COMBOBOX" geometry="71,151,102,60"></Item>
! <Item ID="1342" type="COMBOBOX" geometry="71,166,86,49"></Item>
! <Item ID="1008" type="PUSHBUTTON" geometry="160,166,13,13">""</Item>
! <Item ID="1210" type="COMBOBOX" geometry="71,182,102,51"></Item>
! <Item ID="1345" type="COMBOBOX" geometry="71,198,102,53"></Item>
! <Item ID="1060" type="EDITTEXT" geometry="71,211,102,14"></Item>
! <Item ID="1062" type="EDITTEXT" geometry="71,226,102,14"></Item>
! <Item ID="1063" type="EDITTEXT" geometry="71,241,102,14"></Item>
! <Item ID="1064" type="EDITTEXT" geometry="71,257,102,14"></Item>
! <Item ID="1337" type="CONTROL" geometry="178,108,114,58">"List5"</Item>
! <Item ID="1061" type="CONTROL" geometry="178,171,114,99">"List6"</Item>
! <Item ID="1035" type="CONTROL" geometry="304,263,59,10">"No Axis index"</Item>
! <Item ID="1221" type="COMBOBOX" geometry="342,232,122,52"></Item>
! <Item ID="1007" type="PUSHBUTTON" geometry="465,232,18,12">"Add"</Item>
! <Item ID="1347" type="EDITTEXT" geometry="342,246,141,12"></Item>
! <Item ID="1343" type="CONTROL" geometry="79,296,100,112">"Tree1"</Item>
! <Item ID="1032" type="CONTROL" geometry="290,296,191,97">"List2"</Item>
! <Item ID="1334" type="EDITTEXT" geometry="321,396,33,12"></Item>
! <Item ID="1001" type="PUSHBUTTON" geometry="407,396,35,12">"Add"</Item>
! <Item ID="1002" type="PUSHBUTTON" geometry="444,396,35,12">"Remove"</Item>
<Item ID="1" type="DEFPUSHBUTTON" geometry="437,7,50,14">"OK"</Item>
<Item ID="2" type="PUSHBUTTON" geometry="437,24,50,14">"Cancel"</Item>
! <Item ID="1526" type="GROUPBOX" geometry="299,220,188,54">"Axis Classification"</Item>
! <Item ID="1524" type="GROUPBOX" geometry="7,99,290,176">"Attributes"</Item>
! <Item ID="1527" type="LTEXT" geometry="14,110,20,8">"Name"</Item>
! <Item ID="1528" type="LTEXT" geometry="14,124,39,8">"Name Index"</Item>
! <Item ID="1529" type="LTEXT" geometry="14,139,22,8">"Sound"</Item>
! <Item ID="1532" type="LTEXT" geometry="14,185,45,8">"Tracking Icon"</Item>
! <Item ID="1533" type="LTEXT" geometry="14,199,17,8">"Brain"</Item>
! <Item ID="1534" type="LTEXT" geometry="14,214,31,8">"DefName"</Item>
! <Item ID="1535" type="LTEXT" geometry="14,230,24,8">"Desires"</Item>
! <Item ID="1536" type="LTEXT" geometry="14,244,45,8">"Basic Speech"</Item>
! <Item ID="1537" type="LTEXT" geometry="14,259,42,8">"Basic Events"</Item>
! <Item ID="1530" type="LTEXT" geometry="14,154,46,8">"Creature Base"</Item>
! <Item ID="1531" type="LTEXT" geometry="14,169,21,8">"Colour"</Item>
! <Item ID="1525" type="GROUPBOX" geometry="7,276,480,135">"Miscellaneous Attributes"</Item>
! <Item ID="1538" type="LTEXT" geometry="14,287,30,8">"Attributes"</Item>
! <Item ID="1539" type="LTEXT" geometry="79,287,34,8">"Categories"</Item>
! <Item ID="1540" type="LTEXT" geometry="182,287,103,8">"Choices\t\t(D-Click to Add)"</Item>
! <Item ID="1541" type="LTEXT" geometry="290,287,189,8">"Selections\t\t\t\t(D-Click to Edit)"</Item>
! <Item ID="1545" type="LTEXT" geometry="292,398,25,8">"Amount"</Item>
! <Item ID="1542" type="LTEXT" geometry="304,234,29,8">"Category"</Item>
! <Item ID="1544" type="LTEXT" geometry="304,248,36,8">"Description"</Item>
! <Item ID="1348" type="CONTROL" geometry="300,102,187,110">""</Item>
! <Item ID="235" type="CONTROL" geometry="7,7,176,89">""</Item>
! <Item ID="237" type="CONTROL" geometry="184,7,245,90">""</Item>
</Dialog>
<Dialog ID="152" Caption="Edit Skill/Stat Values">
Index: itemgentab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/itemgentab.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** itemgentab.cpp 26 Jun 2003 22:28:01 -0000 1.24
--- itemgentab.cpp 24 Jul 2003 06:00:05 -0000 1.25
***************
*** 421,426 ****
int index = m_clcItems.GetItemData(iSelIndex);
CString sColor, sDispID;
! sColor = Main->m_pScripts->GetCharacterColor(index);
! sDispID = Main->m_pScripts->GetCharacterDispID(index);
{
if (Main->m_config.DrawItems())
--- 421,426 ----
int index = m_clcItems.GetItemData(iSelIndex);
CString sColor, sDispID;
! sColor = Main->m_pScripts->GetItemColor(index);
! sDispID = Main->m_pScripts->GetItemDispID(index);
{
if (Main->m_config.DrawItems())
|
