gemrb-commits — CVS Commits Report
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(559) |
Nov
(772) |
Dec
(914) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(291) |
Feb
(312) |
Mar
(215) |
Apr
(243) |
May
(150) |
Jun
(18) |
Jul
(131) |
Aug
(436) |
Sep
(171) |
Oct
(233) |
Nov
(222) |
Dec
(141) |
| 2005 |
Jan
(74) |
Feb
(220) |
Mar
(326) |
Apr
(142) |
May
(165) |
Jun
(187) |
Jul
(246) |
Aug
(116) |
Sep
(10) |
Oct
(30) |
Nov
(257) |
Dec
(247) |
| 2006 |
Jan
(165) |
Feb
(38) |
Mar
(58) |
Apr
(135) |
May
(18) |
Jun
(102) |
Jul
(228) |
Aug
(250) |
Sep
(47) |
Oct
(26) |
Nov
(69) |
Dec
(263) |
| 2007 |
Jan
(120) |
Feb
(268) |
Mar
(50) |
Apr
(64) |
May
(49) |
Jun
(39) |
Jul
(22) |
Aug
(56) |
Sep
(9) |
Oct
(2) |
Nov
(47) |
Dec
(115) |
| 2008 |
Jan
(57) |
Feb
(81) |
Mar
(26) |
Apr
(10) |
May
(19) |
Jun
(69) |
Jul
(10) |
Aug
(6) |
Sep
(111) |
Oct
(105) |
Nov
(11) |
Dec
(19) |
| 2009 |
Jan
(92) |
Feb
(159) |
Mar
(86) |
Apr
(59) |
May
(320) |
Jun
(443) |
Jul
(103) |
Aug
(315) |
Sep
(221) |
Oct
(122) |
Nov
(13) |
Dec
(46) |
| 2010 |
Jan
(6) |
Feb
(1) |
Mar
(65) |
Apr
(100) |
May
(83) |
Jun
(171) |
Jul
(145) |
Aug
(223) |
Sep
(107) |
Oct
(89) |
Nov
(123) |
Dec
(86) |
| 2011 |
Jan
(66) |
Feb
(101) |
Mar
(140) |
Apr
(80) |
May
(68) |
Jun
(45) |
Jul
(97) |
Aug
(119) |
Sep
(46) |
Oct
(45) |
Nov
(74) |
Dec
(89) |
| 2012 |
Jan
(124) |
Feb
(156) |
Mar
(102) |
Apr
(56) |
May
(25) |
Jun
(16) |
Jul
(73) |
Aug
(82) |
Sep
(53) |
Oct
(59) |
Nov
(90) |
Dec
(112) |
| 2013 |
Jan
(191) |
Feb
(58) |
Mar
(68) |
Apr
(49) |
May
(28) |
Jun
(42) |
Jul
(25) |
Aug
(15) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
(58) |
| 2014 |
Jan
(100) |
Feb
(2) |
Mar
(4) |
Apr
(1) |
May
(24) |
Jun
(8) |
Jul
(3) |
Aug
(9) |
Sep
(2) |
Oct
(90) |
Nov
(56) |
Dec
(44) |
| 2015 |
Jan
(51) |
Feb
(40) |
Mar
(7) |
Apr
(11) |
May
(6) |
Jun
(23) |
Jul
(46) |
Aug
(63) |
Sep
(58) |
Oct
(32) |
Nov
(32) |
Dec
(9) |
| 2016 |
Jan
(5) |
Feb
(8) |
Mar
(12) |
Apr
(24) |
May
(13) |
Jun
(7) |
Jul
(6) |
Aug
(18) |
Sep
(6) |
Oct
(9) |
Nov
(4) |
Dec
(5) |
| 2017 |
Jan
(6) |
Feb
(3) |
Mar
(13) |
Apr
(2) |
May
(2) |
Jun
(77) |
Jul
(13) |
Aug
(42) |
Sep
(92) |
Oct
(39) |
Nov
(35) |
Dec
(27) |
| 2018 |
Jan
(20) |
Feb
(17) |
Mar
(47) |
Apr
(75) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
1
(2) |
2
(7) |
3
|
4
|
5
|
6
(6) |
|
7
(2) |
8
|
9
|
10
|
11
|
12
(9) |
13
(12) |
|
14
(10) |
15
(4) |
16
(12) |
17
(8) |
18
(10) |
19
|
20
|
|
21
(2) |
22
|
23
(6) |
24
(5) |
25
(6) |
26
|
27
(3) |
|
28
(6) |
29
|
30
(1) |
|
|
|
|
|
From: <lynxlupodian@us...> - 2008-09-13 18:03:29
|
Revision: 5284
http://gemrb.svn.sourceforge.net/gemrb/?rev=5284&view=rev
Author: lynxlupodian
Date: 2008-09-13 18:03:40 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
bg2: made parts of the proficiencies window's left part mouse wheelable
Modified Paths:
--------------
gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py
Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py 2008-09-13 17:39:06 UTC (rev 5283)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py 2008-09-13 18:03:40 UTC (rev 5284)
@@ -98,10 +98,22 @@
RowCount = GemRB.GetTableRowCount(SkillTable)-7 #we decrease it with the bg1 skills
SkillWindow = GemRB.LoadWindow(9)
+ GemRB.SetVar("TopIndex",0)
+ ScrollBarControl = GemRB.GetControl(SkillWindow, 78)
+ GemRB.SetEvent(SkillWindow, ScrollBarControl, IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress")
+ ProfCount = RowCount - 8 # decrease it with the number of controls
+ # decrease it with the number of invalid proficiencies
+ for i in range(RowCount):
+ SkillName = GemRB.GetTableValue (SkillTable, i+8, 1)
+ if SkillName == -1:
+ ProfCount -= 1
+ GemRB.SetVarAssoc (SkillWindow, ScrollBarControl, "TopIndex", ProfCount)
+
for i in range(8):
Button=GemRB.GetControl(SkillWindow, i+69)
GemRB.SetVarAssoc(SkillWindow, Button, "Prof", i)
GemRB.SetEvent(SkillWindow, Button, IE_GUI_BUTTON_ON_PRESS, "JustPress")
+ GemRB.AttachScrollBar (SkillWindow, Button, ScrollBarControl)
Button=GemRB.GetControl(SkillWindow, i*2+11)
GemRB.SetVarAssoc(SkillWindow, Button, "Prof", i)
@@ -113,7 +125,8 @@
for j in range(5):
Star=GemRB.GetControl(SkillWindow, i*5+j+27)
- GemRB.SetButtonState(SkillWindow, Star, IE_GUI_BUTTON_DISABLED)
+ #GemRB.SetButtonState(SkillWindow, Star, IE_GUI_BUTTON_DISABLED)
+ GemRB.AttachScrollBar (SkillWindow, Star, ScrollBarControl)
BackButton = GemRB.GetControl(SkillWindow,77)
GemRB.SetText(SkillWindow,BackButton,15416)
@@ -124,17 +137,6 @@
TextAreaControl = GemRB.GetControl(SkillWindow, 68)
GemRB.SetText(SkillWindow,TextAreaControl,9588)
- GemRB.SetVar("TopIndex",0)
- ScrollBarControl = GemRB.GetControl(SkillWindow, 78)
- GemRB.SetEvent(SkillWindow, ScrollBarControl, IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress")
- ProfCount = RowCount - 8 # decrease it with the number of controls
- # decrease it with the number of invalid proficiencies
- for i in range(RowCount):
- SkillName = GemRB.GetTableValue (SkillTable, i+8, 1)
- if SkillName == -1:
- ProfCount -= 1
- GemRB.SetVarAssoc (SkillWindow, ScrollBarControl, "TopIndex", ProfCount)
-
GemRB.SetEvent(SkillWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
GemRB.SetEvent(SkillWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
GemRB.SetButtonState(SkillWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lynxlupodian@us...> - 2008-09-13 17:38:56
|
Revision: 5283
http://gemrb.svn.sourceforge.net/gemrb/?rev=5283&view=rev
Author: lynxlupodian
Date: 2008-09-13 17:39:06 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
bg2: make part of the left skill window part support mouse scroll
Modified Paths:
--------------
gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py
Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py 2008-09-13 15:41:32 UTC (rev 5282)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py 2008-09-13 17:39:06 UTC (rev 5283)
@@ -104,10 +104,17 @@
SkillTable = GemRB.LoadTable("skills")
SkillWindow = GemRB.LoadWindow(6)
+ GemRB.SetVar("TopIndex", 0)
+ ScrollBarControl = GemRB.GetControl(SkillWindow, 26)
+ GemRB.SetEvent(SkillWindow, ScrollBarControl, IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress")
+ #decrease it with the number of controls on screen (list size)
+ GemRB.SetVarAssoc(SkillWindow, ScrollBarControl, "TopIndex", RowCount-3)
+
for i in range(4):
Button = GemRB.GetControl(SkillWindow, i+21)
GemRB.SetVarAssoc(SkillWindow, Button, "Skill",i)
GemRB.SetEvent(SkillWindow, Button, IE_GUI_BUTTON_ON_PRESS, "JustPress")
+ GemRB.AttachScrollBar (SkillWindow, Button, ScrollBarControl)
Button = GemRB.GetControl(SkillWindow, i*2+11)
GemRB.SetVarAssoc(SkillWindow, Button, "Skill",i)
@@ -126,12 +133,6 @@
TextAreaControl = GemRB.GetControl(SkillWindow, 19)
GemRB.SetText(SkillWindow,TextAreaControl,17248)
- GemRB.SetVar("TopIndex",0)
- ScrollBarControl = GemRB.GetControl(SkillWindow, 26)
- GemRB.SetEvent(SkillWindow, ScrollBarControl,IE_GUI_SCROLLBAR_ON_CHANGE,"ScrollBarPress")
- #decrease it with the number of controls on screen (list size)
- GemRB.SetVarAssoc(SkillWindow, ScrollBarControl, "TopIndex",RowCount-3)
-
GemRB.SetEvent(SkillWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
GemRB.SetEvent(SkillWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
GemRB.SetButtonState(SkillWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lynxlupodian@us...> - 2008-09-13 15:41:22
|
Revision: 5282
http://gemrb.svn.sourceforge.net/gemrb/?rev=5282&view=rev
Author: lynxlupodian
Date: 2008-09-13 15:41:32 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
GameScript: commented out an annoying debug printf in the destructor
Modified Paths:
--------------
gemrb/trunk/gemrb/plugins/Core/GameScript.cpp
Modified: gemrb/trunk/gemrb/plugins/Core/GameScript.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/GameScript.cpp 2008-09-13 15:36:29 UTC (rev 5281)
+++ gemrb/trunk/gemrb/plugins/Core/GameScript.cpp 2008-09-13 15:41:32 UTC (rev 5282)
@@ -1388,7 +1388,7 @@
abort();
}
if (!res) {
- printf("Freeing script %s because its refcount has reached 0.\n", Name);
+ //printf("Freeing script %s because its refcount has reached 0.\n", Name);
script->Release();
}
script = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lynxlupodian@us...> - 2008-09-13 15:36:19
|
Revision: 5281
http://gemrb.svn.sourceforge.net/gemrb/?rev=5281&view=rev
Author: lynxlupodian
Date: 2008-09-13 15:36:29 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
added NEWS stub for the next release
Modified Paths:
--------------
gemrb/trunk/NEWS
Modified: gemrb/trunk/NEWS
===================================================================
--- gemrb/trunk/NEWS 2008-09-13 14:00:47 UTC (rev 5280)
+++ gemrb/trunk/NEWS 2008-09-13 15:36:29 UTC (rev 5281)
@@ -1,3 +1,24 @@
+GemRB V0.3.1 (2008-):
+ New features:
+ - mouse scroll support
+ - starting tob inventory
+ - character import in iwd and how
+ - spritecover for area animations
+ - proper XP bonus for thieving and learning spells
+ - biography editing
+
+ Improved features:
+ -
+ - gcc 4.3 compatibility
+ - PST bestiary
+ - bg2 and tob game modes have been merged
+ - bg2 and iwd2 character generation was simplified and improved
+ - stricter dualclassing prerequisites
+ - the cmake build system is available for other platforms too
+ - pathfinding
+ - less memory leaks
+ - bugfixes
+
GemRB V0.3.0 (2008-02-17):
New features:
- TLK override handling (custom biographies and map notes)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avenger_teambg@us...> - 2008-09-13 14:00:38
|
Revision: 5280
http://gemrb.svn.sourceforge.net/gemrb/?rev=5280&view=rev
Author: avenger_teambg
Date: 2008-09-13 14:00:47 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
fixed guiscript for biography
Modified Paths:
--------------
gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py
Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2008-09-13 13:58:02 UTC (rev 5279)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2008-09-13 14:00:47 UTC (rev 5280)
@@ -12,13 +12,11 @@
EditControl = GemRB.GetControl (BioWindow, 3)
BIO = GemRB.GetToken("BIO")
- GemRB.ConvertEdit (BioWindow, EditControl, 5)
-
- #EditControl = GemRB.GetControl (BioWindow, 3) #get the new index
+ EditControl = GemRB.ConvertEdit (BioWindow, EditControl, 5)
if BIO:
- #GemRB.SetText (BioWindow, EditControl, BIO)
+ GemRB.SetText (BioWindow, EditControl, BIO)
else:
- #GemRB.SetText (BioWindow, EditControl, 15882)
+ GemRB.SetText (BioWindow, EditControl, 15882)
# done
OkButton = GemRB.GetControl (BioWindow, 1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avenger_teambg@us...> - 2008-09-13 13:57:56
|
Revision: 5279
http://gemrb.svn.sourceforge.net/gemrb/?rev=5279&view=rev
Author: avenger_teambg
Date: 2008-09-13 13:58:02 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
fixed ConvertEdit (now links scrollbar too)
Modified Paths:
--------------
gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp
Modified: gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp 2008-09-13 13:28:58 UTC (rev 5278)
+++ gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp 2008-09-13 13:58:02 UTC (rev 5279)
@@ -1988,7 +1988,7 @@
return RuntimeError("Cannot find window!");
}
- Control *ctrl = GetControl(WindowIndex, ControlIndex, IE_GUI_EDIT);
+ TextEdit *ctrl = (TextEdit *) GetControl(WindowIndex, ControlIndex, IE_GUI_EDIT);
if (!ctrl) {
return NULL;
}
@@ -2000,11 +2000,16 @@
ta->ControlID = ctrl->ControlID;
ta->ControlType = IE_GUI_TEXTAREA;
ta->Owner = win;
+ ta->SetFonts (ctrl->GetFont(), ctrl->GetFont() );
win->AddControl( ta );
+ win->Link( ScrollBarID, ( unsigned short ) ta->ControlID );
- win->DelControl ( ControlIndex );
- Py_INCREF( Py_None );
- return Py_None;
+ int ret = core->GetControl( WindowIndex, ta->ControlID );
+
+ if (ret<0) {
+ return NULL;
+ }
+ return PyInt_FromLong( ret );
}
PyDoc_STRVAR( GemRB_SetButtonSprites__doc,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avenger_teambg@us...> - 2008-09-13 13:28:47
|
Revision: 5278
http://gemrb.svn.sourceforge.net/gemrb/?rev=5278&view=rev
Author: avenger_teambg
Date: 2008-09-13 13:28:58 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
GetFont (needed for converting textedit to textarea)
Modified Paths:
--------------
gemrb/trunk/gemrb/plugins/Core/TextEdit.cpp
gemrb/trunk/gemrb/plugins/Core/TextEdit.h
Modified: gemrb/trunk/gemrb/plugins/Core/TextEdit.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/TextEdit.cpp 2008-09-13 12:47:59 UTC (rev 5277)
+++ gemrb/trunk/gemrb/plugins/Core/TextEdit.cpp 2008-09-13 13:28:58 UTC (rev 5278)
@@ -84,6 +84,8 @@
printMessage("TextEdit","Invalid font set!\n", LIGHT_RED);
}
+Font *TextEdit::GetFont() { return font; }
+
/** Set Cursor */
void TextEdit::SetCursor(Sprite2D* cur)
{
Modified: gemrb/trunk/gemrb/plugins/Core/TextEdit.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/TextEdit.h 2008-09-13 12:47:59 UTC (rev 5277)
+++ gemrb/trunk/gemrb/plugins/Core/TextEdit.h 2008-09-13 13:28:58 UTC (rev 5278)
@@ -67,6 +67,7 @@
void Draw(unsigned short x, unsigned short y);
/** Set Font */
void SetFont(Font* f);
+ Font *GetFont();
/** Set Cursor */
void SetCursor(Sprite2D* cur);
/** Set BackGround */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avenger_teambg@us...> - 2008-09-13 12:47:49
|
Revision: 5277
http://gemrb.svn.sourceforge.net/gemrb/?rev=5277&view=rev
Author: avenger_teambg
Date: 2008-09-13 12:47:59 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
use ConvertEdit
Modified Paths:
--------------
gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py
Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2008-09-13 12:42:33 UTC (rev 5276)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2008-09-13 12:47:59 UTC (rev 5277)
@@ -11,11 +11,14 @@
BioWindow = GemRB.LoadWindow (23)
EditControl = GemRB.GetControl (BioWindow, 3)
- bio = GemRB.GetToken("BIO")
- if bio:
- GemRB.CreateTextEdit(BioWindow, 3, 29, 73, 567, 195, "NORMAL", bio)
+ BIO = GemRB.GetToken("BIO")
+ GemRB.ConvertEdit (BioWindow, EditControl, 5)
+
+ #EditControl = GemRB.GetControl (BioWindow, 3) #get the new index
+ if BIO:
+ #GemRB.SetText (BioWindow, EditControl, BIO)
else:
- GemRB.CreateTextEdit(BioWindow, 3, 29, 73, 567, 195, "NORMAL", GemRB.GetString(15882))
+ #GemRB.SetText (BioWindow, EditControl, 15882)
# done
OkButton = GemRB.GetControl (BioWindow, 1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lynxlupodian@us...> - 2008-09-13 11:54:55
|
Revision: 5274
http://gemrb.svn.sourceforge.net/gemrb/?rev=5274&view=rev
Author: lynxlupodian
Date: 2008-09-13 11:55:06 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
bg2::cg bio: create the text edit manually, so no w95 wallpaper is shown
Modified Paths:
--------------
gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py
Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2008-09-13 11:08:33 UTC (rev 5273)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2008-09-13 11:55:06 UTC (rev 5274)
@@ -11,7 +11,7 @@
BioWindow = GemRB.LoadWindow (23)
EditControl = GemRB.GetControl (BioWindow, 3)
- GemRB.SetText (BioWindow, EditControl, 15882)
+ GemRB.CreateTextEdit(BioWindow, 3, 29, 73, 567, 195, "NORMAL", GemRB.GetString(15882))
# done
OkButton = GemRB.GetControl (BioWindow, 1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lynxlupodian@us...> - 2008-09-13 11:08:38
|
Revision: 5273
http://gemrb.svn.sourceforge.net/gemrb/?rev=5273&view=rev
Author: lynxlupodian
Date: 2008-09-13 11:08:33 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
bg2::cg bio: fixed ClearPress being indented with spaces
Modified Paths:
--------------
gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py
Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2008-09-13 11:05:08 UTC (rev 5272)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2008-09-13 11:08:33 UTC (rev 5273)
@@ -45,6 +45,6 @@
return
def ClearPress ():
- GemRB.SetToken ("BIO", "")
- GemRB.SetText (BioWindow, EditControl, GemRB.GetToken ("BIO") )
- return
+ GemRB.SetToken ("BIO", "")
+ GemRB.SetText (BioWindow, EditControl, GemRB.GetToken ("BIO") )
+ return
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lynxlupodian@us...> - 2008-09-13 11:05:02
|
Revision: 5272
http://gemrb.svn.sourceforge.net/gemrb/?rev=5272&view=rev
Author: lynxlupodian
Date: 2008-09-13 11:05:08 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
bg2: fixed the biography window strrefs
Modified Paths:
--------------
gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py
Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2008-09-13 08:54:05 UTC (rev 5271)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2008-09-13 11:05:08 UTC (rev 5272)
@@ -11,16 +11,18 @@
BioWindow = GemRB.LoadWindow (23)
EditControl = GemRB.GetControl (BioWindow, 3)
- GemRB.SetText (BioWindow, EditControl, 53605)
+ GemRB.SetText (BioWindow, EditControl, 15882)
+ # done
OkButton = GemRB.GetControl (BioWindow, 1)
- GemRB.SetText (BioWindow, OkButton, 53604)
+ GemRB.SetText (BioWindow, OkButton, 11973)
- ClearButton = GemRB.GetControl (BioWindow,2)
- GemRB.SetText (BioWindow, ClearButton, 53602)
+ ClearButton = GemRB.GetControl (BioWindow, 4)
+ GemRB.SetText (BioWindow, ClearButton, 34881)
- CancelButton = GemRB.GetControl (BioWindow,4)
- GemRB.SetText (BioWindow, CancelButton, 13727)
+ # back
+ CancelButton = GemRB.GetControl (BioWindow, 2)
+ GemRB.SetText (BioWindow, CancelButton, 12896)
GemRB.SetEvent (BioWindow, OkButton, IE_GUI_BUTTON_ON_PRESS, "OkPress")
GemRB.SetEvent (BioWindow, ClearButton, IE_GUI_BUTTON_ON_PRESS, "ClearPress")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avenger_teambg@us...> - 2008-09-13 08:53:54
|
Revision: 5271
http://gemrb.svn.sourceforge.net/gemrb/?rev=5271&view=rev
Author: avenger_teambg
Date: 2008-09-13 08:54:05 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
convert strrefs to signed before returning them in mappings (for 64 bit compatibility)
Modified Paths:
--------------
gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp
Modified: gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp 2008-09-12 16:45:40 UTC (rev 5270)
+++ gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp 2008-09-13 08:54:05 UTC (rev 5271)
@@ -3972,7 +3972,7 @@
if ((section == je->Section) && (chapter == je->Chapter)) {
if (index == count) {
PyObject* dict = PyDict_New();
- PyDict_SetItemString(dict, "Text", PyInt_FromLong (je->Text));
+ PyDict_SetItemString(dict, "Text", PyInt_FromLong ((signed) je->Text));
PyDict_SetItemString(dict, "GameTime", PyInt_FromLong (je->GameTime));
PyDict_SetItemString(dict, "Section", PyInt_FromLong (je->Section));
PyDict_SetItemString(dict, "Chapter", PyInt_FromLong (je->Chapter));
@@ -4288,7 +4288,7 @@
PyObject* dict = PyDict_New();
PCStatsStruct* ps = MyActor->PCStats;
- PyDict_SetItemString(dict, "BestKilledName", PyInt_FromLong (ps->BestKilledName));
+ PyDict_SetItemString(dict, "BestKilledName", PyInt_FromLong ((signed) ps->BestKilledName));
PyDict_SetItemString(dict, "BestKilledXP", PyInt_FromLong (ps->BestKilledXP));
PyDict_SetItemString(dict, "AwayTime", PyInt_FromLong (ps->AwayTime));
PyDict_SetItemString(dict, "JoinDate", PyInt_FromLong (ps->JoinDate));
@@ -4312,7 +4312,7 @@
return NULL;
}
- PyDict_SetItemString(dict, "FavouriteSpell", PyInt_FromLong (spell->SpellName));
+ PyDict_SetItemString(dict, "FavouriteSpell", PyInt_FromLong ((signed) spell->SpellName));
core->FreeSpell( spell, ps->FavouriteSpells[largest], false );
} else {
@@ -4336,7 +4336,7 @@
return NULL;
}
- PyDict_SetItemString(dict, "FavouriteWeapon", PyInt_FromLong (item->GetItemName(false)));
+ PyDict_SetItemString(dict, "FavouriteWeapon", PyInt_FromLong ((signed) item->GetItemName(false)));
core->FreeItem( item, ps->FavouriteWeapons[largest], false );
} else {
@@ -4995,8 +4995,8 @@
Item *item = core->GetItem( ci->ItemResRef );
int identified = !(ci->Flags & IE_INV_ITEM_IDENTIFIED);
- PyDict_SetItemString(dict, "ItemName", PyInt_FromLong( item->GetItemName( (bool) identified )) );
- PyDict_SetItemString(dict, "ItemDesc", PyInt_FromLong( item->GetItemDesc( (bool) identified )) );
+ PyDict_SetItemString(dict, "ItemName", PyInt_FromLong( (signed) item->GetItemName( (bool) identified )) );
+ PyDict_SetItemString(dict, "ItemDesc", PyInt_FromLong( (signed) item->GetItemDesc( (bool) identified )) );
core->FreeItem( item, ci->ItemResRef, false );
return dict;
}
@@ -5164,7 +5164,7 @@
}
PyObject* dict = PyDict_New();
PyDict_SetItemString(dict, "StoreType", PyInt_FromLong( store->Type ));
- PyDict_SetItemString(dict, "StoreName", PyInt_FromLong( store->StoreName ));
+ PyDict_SetItemString(dict, "StoreName", PyInt_FromLong( (signed) store->StoreName ));
PyDict_SetItemString(dict, "StoreDrinkCount", PyInt_FromLong( store->DrinksCount ));
PyDict_SetItemString(dict, "StoreCureCount", PyInt_FromLong( store->CuresCount ));
PyDict_SetItemString(dict, "StoreItemCount", PyInt_FromLong( store->GetRealStockSize() ));
@@ -5486,8 +5486,8 @@
}
int identified = !!(si->Flags & IE_INV_ITEM_IDENTIFIED);
- PyDict_SetItemString(dict, "ItemName", PyInt_FromLong( item->GetItemName( (bool) identified )) );
- PyDict_SetItemString(dict, "ItemDesc", PyInt_FromLong( item->GetItemDesc( (bool) identified )) );
+ PyDict_SetItemString(dict, "ItemName", PyInt_FromLong( (signed) item->GetItemName( (bool) identified )) );
+ PyDict_SetItemString(dict, "ItemDesc", PyInt_FromLong( (signed) item->GetItemDesc( (bool) identified )) );
int price = item->Price * store->SellMarkup / 100;
//calculate depreciation too
@@ -5527,7 +5527,7 @@
}
PyObject* dict = PyDict_New();
STODrink *drink=store->GetDrink(index);
- PyDict_SetItemString(dict, "DrinkName", PyInt_FromLong( drink->DrinkName ));
+ PyDict_SetItemString(dict, "DrinkName", PyInt_FromLong( (signed) drink->DrinkName ));
PyDict_SetItemString(dict, "Price", PyInt_FromLong( drink->Price ));
PyDict_SetItemString(dict, "Strength", PyInt_FromLong( drink->Strength ));
return dict;
@@ -5670,7 +5670,7 @@
STOCure *cure=store->GetCure(index);
PyDict_SetItemString(dict, "CureResRef", PyString_FromResRef( cure->CureResRef ));
PyDict_SetItemString(dict, "Price", PyInt_FromLong( cure->Price ));
- PyDict_SetItemString(dict, "Description", PyInt_FromLong( GetSpellDesc(cure->CureResRef) ) );
+ PyDict_SetItemString(dict, "Description", PyInt_FromLong( (signed) GetSpellDesc(cure->CureResRef) ) );
return dict;
}
@@ -6003,8 +6003,8 @@
}
PyObject* dict = PyDict_New();
- PyDict_SetItemString(dict, "SpellName", PyInt_FromLong (spell->SpellName));
- PyDict_SetItemString(dict, "SpellDesc", PyInt_FromLong (spell->SpellDesc));
+ PyDict_SetItemString(dict, "SpellName", PyInt_FromLong ((signed) spell->SpellName));
+ PyDict_SetItemString(dict, "SpellDesc", PyInt_FromLong ((signed) spell->SpellDesc));
PyDict_SetItemString(dict, "SpellbookIcon", PyString_FromResRef (spell->SpellbookIcon));
PyDict_SetItemString(dict, "SpellExclusion", PyInt_FromLong (spell->ExclusionSchool)); //this will list school exclusions and alignment
PyDict_SetItemString(dict, "SpellDivine", PyInt_FromLong (spell->PriestType)); //this will tell apart a priest spell from a druid spell
@@ -6320,16 +6320,16 @@
}
PyObject* dict = PyDict_New();
- PyDict_SetItemString(dict, "ItemName", PyInt_FromLong (item->GetItemName(false)));
- PyDict_SetItemString(dict, "ItemNameIdentified", PyInt_FromLong (item->GetItemName(true)));
- PyDict_SetItemString(dict, "ItemDesc", PyInt_FromLong (item->GetItemDesc(false)));
- PyDict_SetItemString(dict, "ItemDescIdentified", PyInt_FromLong (item->GetItemDesc(true)));
+ PyDict_SetItemString(dict, "ItemName", PyInt_FromLong ((signed) item->GetItemName(false)));
+ PyDict_SetItemString(dict, "ItemNameIdentified", PyInt_FromLong ((signed) item->GetItemName(true)));
+ PyDict_SetItemString(dict, "ItemDesc", PyInt_FromLong ((signed) item->GetItemDesc(false)));
+ PyDict_SetItemString(dict, "ItemDescIdentified", PyInt_FromLong ((signed)item->GetItemDesc(true)));
PyDict_SetItemString(dict, "ItemIcon", PyString_FromResRef (item->ItemIcon));
PyDict_SetItemString(dict, "DescIcon", PyString_FromResRef (item->DescriptionIcon));
PyDict_SetItemString(dict, "BrokenItem", PyString_FromResRef (item->ReplacementItem));
PyDict_SetItemString(dict, "StackAmount", PyInt_FromLong (item->StackAmount));
PyDict_SetItemString(dict, "Dialog", PyString_FromResRef (item->Dialog));
- PyDict_SetItemString(dict, "DialogName", PyInt_FromLong (item->DialogName));
+ PyDict_SetItemString(dict, "DialogName", PyInt_FromLong ((signed)item->DialogName));
PyDict_SetItemString(dict, "Price", PyInt_FromLong (item->Price));
PyDict_SetItemString(dict, "Type", PyInt_FromLong (item->ItemType));
PyDict_SetItemString(dict, "AnimationType", PyString_FromAnimID(item->AnimationType));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|