Thanks for helping keep SourceForge clean.

Click URL instructions:
Right-click on ad, choose "Copy Link", then paste here →
(This may not be possible with some types of ads)

More information about our ad policies

GemRB Game Engine

GemRB is a portable open-source implementation of the Infinity Engine

Status: Beta

Brought to you by: avenger_teambg, edheldil, lynxlupodian, wjpalenstijn

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	3	4 (1)	5
6 (23)	7 (2)	8 (1)	9	10 (10)	11 (14)	12 (5)
13 (21)	14 (7)	15 (3)	16 (3)	17 (8)	18 (2)	19 (2)
20 (14)	21 (7)	22 (14)	23 (18)	24 (29)	25 (4)	26 (19)
27 (32)	28 (2)	29 (11)	30 (3)

Flat | Threaded

[Gemrb-commits] gemrb/gemrb/plugins/Core GSUtils.cpp,1.26,1.27 TextArea.cpp,1.80,1.81

From: Laszlo Toth <avenger_teambg@us...> - 2005-11-12 22:37:20

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511

Modified Files:
	GSUtils.cpp TextArea.cpp 
Log Message:
fixed smooth scrolling textarea


Index: TextArea.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/TextArea.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** TextArea.cpp	12 Nov 2005 19:31:51 -0000	1.80
--- TextArea.cpp	12 Nov 2005 22:37:10 -0000	1.81
***************
*** 66,69 ****
--- 66,74 ----
  void TextArea::Draw(unsigned short x, unsigned short y)
  {
+ 	int tx=x+XPos;
+ 	int ty=y+YPos;
+ 	Region clip( tx, ty, Width, Height );
+ 	Video *video = core->GetVideoDriver();
+ 
  	//this might look better in GlobalTimer
  	//or you might want to change the animated button to work like this
***************
*** 82,85 ****
--- 87,93 ----
  				}
  			}
+ 			Color black = { 0, 0, 0, 255 };
+ 			video->DrawRect( clip, black );
+ 
  			Changed = true;
  			( ( Window * ) Owner )->Invalidate();
***************
*** 98,103 ****
  	}
  
- 	int tx=x+XPos;
- 	int ty=y+YPos;
  	//smooth vertical scrolling up
  	if (Flags & IE_GUI_TEXTAREA_SMOOTHSCROLL) {
--- 106,109 ----
***************
*** 153,156 ****
--- 159,163 ----
  			}
  		}
+ 		video->SetClipRect( &clip );
  		ftext->PrintFromLine( startrow,
  			Region( tx , ty, Width, Height - 5 ),
***************
*** 158,161 ****
--- 165,169 ----
  			IE_FONT_ALIGN_LEFT, finit, NULL );
  		free( Buffer );
+ 		video->SetClipRect( NULL );
  		return;
  	}

Index: GSUtils.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GSUtils.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** GSUtils.cpp	12 Nov 2005 14:05:16 -0000	1.26
--- GSUtils.cpp	12 Nov 2005 22:37:10 -0000	1.27
***************
*** 811,815 ****
  	}
  	if ( Distance(Sender, target) > wrange ) {
- printf("GoNearAndRetry\n");
  		GoNearAndRetry(Sender, target, true);
  		if (flags&AC_REEVALUATE) {
--- 811,814 ----
***************
*** 818,823 ****
  		return;
  	}
- printf("Debugdump of target:\n");
- ((Actor *) target)->DebugDump();
  	actor->SetTarget( target );
  	//attackreevaluate
--- 817,820 ----

[Gemrb-commits] gemrb/gemrb/plugins/Core Button.cpp,1.89,1.90 Control.cpp,1.38,1.39 GameControl.cpp,1.255,1.256 Label.cpp,1.32,1.33 Progressbar.cpp,1.16,1.17 ScrollBar.cpp,1.32,1.33 Slider.cpp,1.28,1.29 TextArea.cpp,1.79,1.80 TextEdit.cpp,1.29,1.30 Window.cpp,1.43,1.44 Window.h,1.21,1.22

From: Laszlo Toth <avenger_teambg@us...> - 2005-11-12 19:32:02

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28318/Core

Modified Files:
	Button.cpp Control.cpp GameControl.cpp Label.cpp 
	Progressbar.cpp ScrollBar.cpp Slider.cpp TextArea.cpp 
	TextEdit.cpp Window.cpp Window.h 
Log Message:
hopefully fixed a graphical glitch without adding new ones (select all button is visible in bg2)
consolidated window flags into a single variable


Index: TextEdit.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/TextEdit.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** TextEdit.cpp	16 Oct 2005 21:36:46 -0000	1.29
--- TextEdit.cpp	12 Nov 2005 19:31:51 -0000	1.30
***************
*** 52,56 ****
  void TextEdit::Draw(unsigned short x, unsigned short y)
  {
! 	if (!Changed && !((Window*)Owner)->Floating) {
  		return;
  	}
--- 52,56 ----
  void TextEdit::Draw(unsigned short x, unsigned short y)
  {
! 	if (!Changed && !(((Window*)Owner)->Flags&WF_FLOAT)) {
  		return;
  	}

Index: Progressbar.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Progressbar.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Progressbar.cpp	14 Aug 2005 17:52:25 -0000	1.16
--- Progressbar.cpp	12 Nov 2005 19:31:51 -0000	1.17
***************
*** 60,64 ****
  {
  	//it is unlikely that a floating window is above us, but...
! 	if (!Changed && !((Window*)Owner)->Floating) {
  		return;
  	}
--- 60,64 ----
  {
  	//it is unlikely that a floating window is above us, but...
! 	if (!Changed && !(( (Window*)Owner)->Flags&WF_FLOAT) ) {
  		return;
  	}

Index: Window.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Window.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Window.h	20 Oct 2005 23:13:14 -0000	1.21
--- Window.h	12 Nov 2005 19:31:51 -0000	1.22
***************
*** 48,51 ****
--- 48,57 ----
  #endif
  
+ // Window Flags
+ #define WF_CHANGED  1     //window changed
+ #define WF_FRAME    2     //window has frame
+ #define WF_FLOAT    4     //floating window
+ #define WF_CHILD    8     //if invalidated, it invalidates all windows on top of it
+ 
  // Window position anchors (actually flags for WindowSetPos())
  // !!! Keep these synchronized with GUIDefines.py !!!
***************
*** 139,147 ****
  	char Visible;  //0,1,2
  	/** Changed Flag */
! 	bool Changed;
  	/** Floating Flag */
! 	bool Floating;
  	/** Window is framed */
! 	bool Frame;
  	int Cursor;
  	int DefaultControl;
--- 145,154 ----
  	char Visible;  //0,1,2
  	/** Changed Flag */
! 	//bool Changed;
  	/** Floating Flag */
! 	//bool Floating;
  	/** Window is framed */
! 	//bool Frame;
! 	int Flags; //all flags Changed, Floating, Frame, Child
  	int Cursor;
  	int DefaultControl;

Index: Control.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Control.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Control.cpp	18 Oct 2005 22:43:41 -0000	1.38
--- Control.cpp	12 Nov 2005 19:31:51 -0000	1.39
***************
*** 198,202 ****
  	Changed = true;
  	//Flags |= IE_GUI_BUTTON_PICTURE;
! 	( ( Window * ) Owner )->Invalidate();
  }
  
--- 198,202 ----
  	Changed = true;
  	//Flags |= IE_GUI_BUTTON_PICTURE;
! 	//( ( Window * ) Owner )->Invalidate();
  }
  

Index: TextArea.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/TextArea.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** TextArea.cpp	15 Aug 2005 20:29:17 -0000	1.79
--- TextArea.cpp	12 Nov 2005 19:31:51 -0000	1.80
***************
*** 83,92 ****
  			}
  			Changed = true;
- 			( ( Window * ) Owner )->Changed = true;
  			( ( Window * ) Owner )->Invalidate();
  		}
  	}
  
! 	if (!Changed && !((Window*)Owner)->Floating) {
  		return;
  	}
--- 83,91 ----
  			}
  			Changed = true;
  			( ( Window * ) Owner )->Invalidate();
  		}
  	}
  
! 	if (!Changed && !(((Window*)Owner)->Flags&WF_FLOAT) ) {
  		return;
  	}

Index: Label.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Label.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Label.cpp	10 Apr 2005 16:06:04 -0000	1.32
--- Label.cpp	12 Nov 2005 19:31:51 -0000	1.33
***************
*** 44,48 ****
  void Label::Draw(unsigned short x, unsigned short y)
  {
! 	if (!Changed && !((Window*)Owner)->Floating) {
  		return;
  	}
--- 44,48 ----
  void Label::Draw(unsigned short x, unsigned short y)
  {
! 	if (!Changed && !(((Window*)Owner)->Flags&WF_FLOAT)) {
  		return;
  	}

Index: Button.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Button.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** Button.cpp	14 Aug 2005 17:52:25 -0000	1.89
--- Button.cpp	12 Nov 2005 19:31:51 -0000	1.90
***************
*** 132,136 ****
  void Button::Draw(unsigned short x, unsigned short y)
  {
! 	if (!Changed && !((Window*)Owner)->Floating) {
  		return;
  	}
--- 132,136 ----
  void Button::Draw(unsigned short x, unsigned short y)
  {
! 	if (!Changed && !(((Window*)Owner)->Flags&WF_FLOAT) ) {
  		return;
  	}

Index: GameControl.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameControl.cpp,v
retrieving revision 1.255
retrieving revision 1.256
diff -C2 -d -r1.255 -r1.256
*** GameControl.cpp	12 Nov 2005 15:15:06 -0000	1.255
--- GameControl.cpp	12 Nov 2005 19:31:51 -0000	1.256
***************
*** 1285,1289 ****
  			Window* fw = core->GetWindow( index );
  			core->SetVisible( index, WINDOW_VISIBLE );
! 			fw->Floating = true;
  			core->SetOnTop( index );
  		}
--- 1285,1289 ----
  			Window* fw = core->GetWindow( index );
  			core->SetVisible( index, WINDOW_VISIBLE );
! 			fw->Flags |=WF_FLOAT;
  			core->SetOnTop( index );
  		}

Index: ScrollBar.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/ScrollBar.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** ScrollBar.cpp	28 Feb 2005 22:49:48 -0000	1.32
--- ScrollBar.cpp	12 Nov 2005 19:31:51 -0000	1.33
***************
*** 72,76 ****
  void ScrollBar::Draw(unsigned short x, unsigned short y)
  {
! 	if (!Changed && !((Window*)Owner)->Floating) {
  		return;
  	}
--- 72,76 ----
  void ScrollBar::Draw(unsigned short x, unsigned short y)
  {
! 	if (!Changed && !(((Window*)Owner)->Flags&WF_FLOAT) ) {
  		return;
  	}

Index: Window.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Window.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Window.cpp	14 Aug 2005 17:52:25 -0000	1.43
--- Window.cpp	12 Nov 2005 19:31:51 -0000	1.44
***************
*** 40,49 ****
  	lastFocus = NULL;
  	Visible = WINDOW_INVISIBLE;
! 	Changed = true;
! 	Floating = false;
  	Cursor = IE_CURSOR_NORMAL;
  	DefaultControl = -1;
- 
- 	Frame = false;
  }
  
--- 40,46 ----
  	lastFocus = NULL;
  	Visible = WINDOW_INVISIBLE;
! 	Flags = WF_CHANGED;
  	Cursor = IE_CURSOR_NORMAL;
  	DefaultControl = -1;
  }
  
***************
*** 94,100 ****
  	Video* video = core->GetVideoDriver();
  	Region clip( XPos, YPos, Width, Height );
! 	if (Changed && Frame) {
  		Region screen( 0, 0, core->Width, core->Height );
  		video->SetClipRect( NULL );
  		Color black = { 0, 0, 0, 255 };
  		video->DrawRect( screen, black );
--- 91,99 ----
  	Video* video = core->GetVideoDriver();
  	Region clip( XPos, YPos, Width, Height );
! 	//Frame && Changed
! 	if ( (Flags & (WF_FRAME|WF_CHANGED) )== (WF_FRAME|WF_CHANGED) ) {
  		Region screen( 0, 0, core->Width, core->Height );
  		video->SetClipRect( NULL );
+ 		//removed this?
  		Color black = { 0, 0, 0, 255 };
  		video->DrawRect( screen, black );
***************
*** 109,113 ****
  	}
  	video->SetClipRect( &clip );
! 	if (BackGround && (Changed || Floating)) {
  		video->BlitSprite( BackGround, XPos, YPos, true );
  	}
--- 108,113 ----
  	}
  	video->SetClipRect( &clip );
! 	//Float || Changed
! 	if (BackGround && (Flags & (WF_FLOAT|WF_CHANGED) ) ) {
  		video->BlitSprite( BackGround, XPos, YPos, true );
  	}
***************
*** 116,125 ****
  		( *m )->Draw( XPos, YPos );
  	}
! 	if (Changed && (Visible == WINDOW_GRAYED) ) {
  		Color black = { 0, 0, 0, 128 };
  		video->DrawRect(clip, black);
  	}
  	video->SetClipRect( NULL );
! 	Changed = false;
  }
  
--- 116,125 ----
  		( *m )->Draw( XPos, YPos );
  	}
! 	if ( (Flags&WF_CHANGED) && (Visible == WINDOW_GRAYED) ) {
  		Color black = { 0, 0, 0, 128 };
  		video->DrawRect(clip, black);
  	}
  	video->SetClipRect( NULL );
! 	Flags &= ~WF_CHANGED;
  }
  
***************
*** 127,133 ****
  void Window::SetFrame()
  {
! 	Frame = (Width < core->Width) || (Height < core->Height);
  	Invalidate();
- 
  }
  
--- 127,134 ----
  void Window::SetFrame()
  {
! 	if ( (Width < core->Width) || (Height < core->Height) ) {
! 		Flags|=WF_FRAME;
! 	}
  	Invalidate();
  }
  
***************
*** 225,229 ****
  		}
  	}
! 	Changed = true;
  }
  
--- 226,230 ----
  		}
  	}
! 	Flags |= WF_CHANGED;
  }
  

Index: Slider.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Slider.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Slider.cpp	14 Aug 2005 17:52:25 -0000	1.28
--- Slider.cpp	12 Nov 2005 19:31:51 -0000	1.29
***************
*** 60,64 ****
  void Slider::Draw(unsigned short x, unsigned short y)
  {
! 	if (!Changed && !((Window*)Owner)->Floating) {
  		return;
  	}
--- 60,64 ----
  void Slider::Draw(unsigned short x, unsigned short y)
  {
! 	if (!Changed && !(((Window*)Owner)->Flags&WF_FLOAT) ) {
  		return;
  	}

[Gemrb-commits] gemrb/gemrb/plugins/Core GameControl.cpp,1.254,1.255

From: Laszlo Toth <avenger_teambg@us...> - 2005-11-12 15:15:17

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29468

Modified Files:
	GameControl.cpp 
Log Message:
Continued implementation of target_mode (now you can talk/attack party members)
or attack neutral actors


Index: GameControl.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameControl.cpp,v
retrieving revision 1.254
retrieving revision 1.255
diff -C2 -d -r1.254 -r1.255
*** GameControl.cpp	10 Nov 2005 21:10:30 -0000	1.254
--- GameControl.cpp	12 Nov 2005 15:15:06 -0000	1.255
***************
*** 1051,1054 ****
--- 1051,1064 ----
  	}
  	
+ 	if (target_mode&TARGET_MODE_ATTACK) {
+ 		type = 2;
+ 	} else if (target_mode&TARGET_MODE_TALK) {
+ 		type = 1;
+ 	} else if (target_mode&TARGET_MODE_CAST) {
+ 		type = 3;
+ 	}
+ 
+ 	target_mode = TARGET_MODE_NONE;
+ 
  	switch (type) {
  		case 0:
***************
*** 1076,1079 ****
--- 1086,1091 ----
  			}
  			break;
+ 		case 3: //cast on target
+ 			break;
  	}
  }

[Gemrb-commits] gemrb/gemrb/plugins/Core Actions.cpp,1.37,1.38 Actor.cpp,1.129,1.130 ActorBlock.cpp,1.111,1.112 GSUtils.cpp,1.25,1.26

From: Laszlo Toth <avenger_teambg@us...> - 2005-11-12 14:05:28

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18090/Core

Modified Files:
	Actions.cpp Actor.cpp ActorBlock.cpp GSUtils.cpp 
Log Message:
fixed ForceAttack action
setting LastAttacker
ClearActions will clear WaitCounter/playDeadCounter
Dialogue will clear the action queue of both sides


Index: GSUtils.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GSUtils.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** GSUtils.cpp	11 Nov 2005 22:33:14 -0000	1.25
--- GSUtils.cpp	12 Nov 2005 14:05:16 -0000	1.26
***************
*** 724,728 ****
  	}
  
- 	//we also need to freeze active scripts during a dialog!
  	if (speaker!=target) {
  		if (swap) {
--- 724,727 ----
***************
*** 731,738 ****
  			speaker = tmp;
  		} else {
! 			if (Flags & BD_INTERRUPT) {
! 				scr->ClearActions();
! 			} else {
! 				if (scr->GetNextAction()) {
  					core->DisplayConstantString(STR_TARGETBUSY,0xff0000);
  					goto end_of_quest;
--- 730,735 ----
  			speaker = tmp;
  		} else {
! 			if (!(Flags & BD_INTERRUPT)) {
! 				if (tar->GetNextAction()) {
  					core->DisplayConstantString(STR_TARGETBUSY,0xff0000);
  					goto end_of_quest;
***************
*** 743,746 ****
--- 740,746 ----
  	}
  
+ 	scr->ClearActions();
+ 	if (scr!=tar)
+ 		tar->ClearActions();
  	speaker->SetOrientation(GetOrient( target->Pos, speaker->Pos), true);
  	target->SetOrientation(GetOrient( speaker->Pos, target->Pos), true);
***************
*** 811,814 ****
--- 811,815 ----
  	}
  	if ( Distance(Sender, target) > wrange ) {
+ printf("GoNearAndRetry\n");
  		GoNearAndRetry(Sender, target, true);
  		if (flags&AC_REEVALUATE) {
***************
*** 817,826 ****
  		return;
  	}
! 	//TODO:
! 	//send Attack trigger to attacked
! 	//calculate attack/damage
  	actor->SetTarget( target );
- 	//actor->SetStance( IE_ANI_ATTACK );
- 	//actor->SetWait( 1 );
  	//attackreevaluate
  	if ( (flags&AC_REEVALUATE) && parameters->int0Parameter) {
--- 818,824 ----
  		return;
  	}
! printf("Debugdump of target:\n");
! ((Actor *) target)->DebugDump();
  	actor->SetTarget( target );
  	//attackreevaluate
  	if ( (flags&AC_REEVALUATE) && parameters->int0Parameter) {
***************
*** 1144,1148 ****
  void GoNearAndRetry(Scriptable *Sender, Point &p)
  {
! 	Sender->AddActionInFront( Sender->CurrentAction );
  	char Tmp[256];
  	sprintf( Tmp, "MoveToPoint([%hd.%hd])", p.x, p.y );
--- 1142,1148 ----
  void GoNearAndRetry(Scriptable *Sender, Point &p)
  {
! 	if (Sender->CurrentAction) {
! 		Sender->AddActionInFront( Sender->CurrentAction );
! 	}
  	char Tmp[256];
  	sprintf( Tmp, "MoveToPoint([%hd.%hd])", p.x, p.y );

Index: ActorBlock.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/ActorBlock.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** ActorBlock.cpp	6 Nov 2005 14:03:09 -0000	1.111
--- ActorBlock.cpp	12 Nov 2005 14:05:16 -0000	1.112
***************
*** 202,205 ****
--- 202,207 ----
  	}
  	actionQueue.clear();
+ 	WaitCounter = 0;
+ 	playDeadCounter = 0; // i'm not sure about this
  }
  

Index: Actions.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Actions.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Actions.cpp	10 Nov 2005 21:10:30 -0000	1.37
--- Actions.cpp	12 Nov 2005 14:05:16 -0000	1.38
***************
*** 3508,3521 ****
  	Scriptable* scr = GetActorFromObject( Sender, parameters->objects[1] );
  	if (!scr || scr->Type != ST_ACTOR) {
! 		Sender->CurrentAction = NULL;
  		return;
  	}
  	Scriptable* tar = GetActorFromObject( Sender, parameters->objects[2] );
  	if (!tar || (tar->Type != ST_ACTOR && tar->Type !=ST_DOOR && tar->Type !=ST_CONTAINER) ) {
! 		Sender->CurrentAction = NULL;
  		return;
  	}
! 	AttackCore(scr, tar, NULL, 0);
! 	Sender->CurrentAction = NULL;
  }
  
--- 3508,3528 ----
  	Scriptable* scr = GetActorFromObject( Sender, parameters->objects[1] );
  	if (!scr || scr->Type != ST_ACTOR) {
! 		//Sender->CurrentAction = NULL;
  		return;
  	}
  	Scriptable* tar = GetActorFromObject( Sender, parameters->objects[2] );
  	if (!tar || (tar->Type != ST_ACTOR && tar->Type !=ST_DOOR && tar->Type !=ST_CONTAINER) ) {
! 		//Sender->CurrentAction = NULL;
  		return;
  	}
! 	GameControl *gc = core->GetGameControl();
! 	if (gc) {
! 		gc->target = (Actor *) tar;
! 		char Tmp[256];
! 		strncpy(Tmp,"NIDSpecial3()",sizeof(Tmp) );
! 		scr->AddAction( GenerateAction(Tmp,true) );
! 	}
! 	//AttackCore(scr, tar, NULL, 0);
! 	//Sender->CurrentAction = NULL;
  }
  

Index: Actor.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Actor.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** Actor.cpp	11 Nov 2005 22:05:45 -0000	1.129
--- Actor.cpp	12 Nov 2005 14:05:16 -0000	1.130
***************
*** 588,591 ****
--- 588,592 ----
  	core->GetGame()->locals->Lookup("APPEARANCE",tmp);
  	printf( "\nDisguise: %d\n", tmp);
+ 	printf( "WaitCounter: %d\n", (int) GetWait());
  	inventory.dump();
  	spellbook.dump();
***************
*** 917,921 ****
  {
  	if (target->Type==ST_ACTOR) {
! 		LastTarget = ((Actor *) target)->GetID();
  	}
  	//calculate attack style
--- 918,925 ----
  {
  	if (target->Type==ST_ACTOR) {
! 		Actor *tar = (Actor *) target;
! 		LastTarget = tar->GetID();
! 		tar->LastAttacker = GetID();
! printf("%s got lastattacker as %s\n",tar->GetName(-1), GetName(-1));
  	}
  	//calculate attack style

[Gemrb-commits] gemrb/gemrb/GUIScripts/pst MessageWindow.py,1.32,1.33

From: Laszlo Toth <avenger_teambg@us...> - 2005-11-12 12:00:00

Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/pst
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28344

Modified Files:
	MessageWindow.py 
Log Message:
fixed messagewindow for pst


Index: MessageWindow.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/pst/MessageWindow.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** MessageWindow.py	16 Oct 2005 21:54:37 -0000	1.32
--- MessageWindow.py	12 Nov 2005 11:59:52 -0000	1.33
***************
*** 58,64 ****
  
  	MessageTA = GemRB.GetControl (MessageWindow, 1)
! 	#GemRB.SetTextAreaFlags (MessageWindow, MessageTA, IE_GUI_TEXTAREA_AUTOSCROLL)
! 	#GemRB.SetTextAreaFlags (MessageWindow, MessageTA, IE_GUI_TEXTAREA_SMOOTHSCROLL)
! 	GemRB.RewindTA (MessageWindow, MessageTA, 100)
  	GemRB.SetVar ("MessageTextArea", MessageTA)
  	GemRB.SetVar ("ActionsWindow", ActionsWindow)
--- 58,63 ----
  
  	MessageTA = GemRB.GetControl (MessageWindow, 1)
! 	GemRB.SetTextAreaFlags (MessageWindow, MessageTA, IE_GUI_TEXTAREA_AUTOSCROLL)
! 	GemRB.SetTAHistory (MessageWindow, MessageTA, 100)
  	GemRB.SetVar ("MessageTextArea", MessageTA)
  	GemRB.SetVar ("ActionsWindow", ActionsWindow)

Flat | Threaded

S	M	T	W	T	F	S
		1 (2)	2	3	4 (1)	5
6 (23)	7 (2)	8 (1)	9	10 (10)	11 (14)	12 (5)
13 (21)	14 (7)	15 (3)	16 (3)	17 (8)	18 (2)	19 (2)
20 (14)	21 (7)	22 (14)	23 (18)	24 (29)	25 (4)	26 (19)
27 (32)	28 (2)	29 (11)	30 (3)