Menu
▾
▴
[Gemrb-commits] SF.net SVN: gemrb:[5400] gemrb/trunk/gemrb/plugins/Core
|
From: <ave...@us...> - 2008-10-05 17:53:47
|
Revision: 5400
http://gemrb.svn.sourceforge.net/gemrb/?rev=5400&view=rev
Author: avenger_teambg
Date: 2008-10-05 17:49:26 +0000 (Sun, 05 Oct 2008)
Log Message:
-----------
more consts in Interface, more comments in ScrollBar
Modified Paths:
--------------
gemrb/trunk/gemrb/plugins/Core/Interface.cpp
gemrb/trunk/gemrb/plugins/Core/Interface.h
gemrb/trunk/gemrb/plugins/Core/ScrollBar.cpp
gemrb/trunk/gemrb/plugins/Core/ScrollBar.h
Modified: gemrb/trunk/gemrb/plugins/Core/Interface.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Interface.cpp 2008-10-05 15:36:46 UTC (rev 5399)
+++ gemrb/trunk/gemrb/plugins/Core/Interface.cpp 2008-10-05 17:49:26 UTC (rev 5400)
@@ -1784,7 +1784,7 @@
return NULL;
}
-void Interface::FreeString(char *&str)
+void Interface::FreeString(char *&str) const
{
if (str) {
strings->FreeString(str);
@@ -1792,7 +1792,7 @@
str = NULL;
}
-char* Interface::GetString(ieStrRef strref, ieDword options)
+char* Interface::GetString(ieStrRef strref, ieDword options) const
{
ieDword flags = 0;
@@ -3995,14 +3995,14 @@
//switch for IE_INV_ITEM_* if it is a CREItem
if (item->Flags&IE_ITEM_TWO_HANDED) {
//cannot equip twohanded in offhand
- if (feedback) core->DisplayConstantString(STR_2HANDEDOFFHAND, 0xf0f0f0);
+ if (feedback) DisplayConstantString(STR_2HANDEDOFFHAND, 0xf0f0f0);
return 0;
}
}
if ( (unsigned int) item->ItemType>=(unsigned int) ItemTypes) {
//invalid itemtype
- if (feedback) core->DisplayConstantString(STR_WRONGITEMTYPE, 0xf0f0f0);
+ if (feedback) DisplayConstantString(STR_WRONGITEMTYPE, 0xf0f0f0);
return 0;
}
@@ -4010,7 +4010,7 @@
if (actor) {
ieStrRef str = actor->Unusable(item);
if (str) {
- if (feedback) core->DisplayConstantString(str, 0xf0f0f0);
+ if (feedback) DisplayConstantString(str, 0xf0f0f0);
return 0;
}
}
@@ -4018,7 +4018,7 @@
//if any bit is true, the answer counts as true
int ret = (slotmatrix[item->ItemType]&slottype);
if (!ret) {
- if (feedback) core->DisplayConstantString(STR_WRONGITEMTYPE, 0xf0f0f0);
+ if (feedback) DisplayConstantString(STR_WRONGITEMTYPE, 0xf0f0f0);
}
return ret;
}
@@ -4059,7 +4059,7 @@
return NULL;
}
-void Interface::DisplayString(const char* Text)
+void Interface::DisplayString(const char* Text) const
{
Label *l = GetMessageLabel();
if (l) {
@@ -4075,12 +4075,12 @@
static const char* DisplayFormat = "[/color][p][color=%lX]%s[/color][/p]";
static const char* DisplayFormatValue = "[/color][p][color=%lX]%s: %d[/color][/p]";
-ieStrRef Interface::GetStringReference(int stridx)
+ieStrRef Interface::GetStringReference(int stridx) const
{
return strref_table[stridx];
}
-void Interface::DisplayConstantString(int stridx, unsigned int color)
+void Interface::DisplayConstantString(int stridx, unsigned int color) const
{
if (stridx<0) return;
char* text = GetString( strref_table[stridx], IE_STR_SOUND );
@@ -4092,7 +4092,7 @@
free( newstr );
}
-void Interface::DisplayString(int stridx, unsigned int color, ieDword flags)
+void Interface::DisplayString(int stridx, unsigned int color, ieDword flags) const
{
if (stridx<0) return;
char* text = GetString( stridx, flags);
@@ -4104,7 +4104,7 @@
free( newstr );
}
-void Interface::DisplayConstantStringValue(int stridx, unsigned int color, ieDword value)
+void Interface::DisplayConstantStringValue(int stridx, unsigned int color, ieDword value) const
{
if (stridx<0) return;
char* text = GetString( strref_table[stridx], IE_STR_SOUND );
@@ -4119,7 +4119,7 @@
#define PALSIZE 8
static Color ActorColor[PALSIZE];
-void Interface::DisplayConstantStringName(int stridx, unsigned int color, Scriptable *speaker)
+void Interface::DisplayConstantStringName(int stridx, unsigned int color, Scriptable *speaker) const
{
unsigned int speaker_color;
const char *name;
@@ -4152,7 +4152,7 @@
free( newstr );
}
-void Interface::DisplayConstantStringAction(int stridx, unsigned int color, Scriptable *attacker, Scriptable *target)
+void Interface::DisplayConstantStringAction(int stridx, unsigned int color, Scriptable *attacker, Scriptable *target) const
{
unsigned int attacker_color;
const char *name1;
@@ -4190,7 +4190,7 @@
free( newstr );
}
-void Interface::DisplayStringName(int stridx, unsigned int color, Scriptable *speaker, ieDword flags)
+void Interface::DisplayStringName(int stridx, unsigned int color, Scriptable *speaker, ieDword flags) const
{
unsigned int speaker_color;
const char *name;
Modified: gemrb/trunk/gemrb/plugins/Core/Interface.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Interface.h 2008-10-05 15:36:46 UTC (rev 5399)
+++ gemrb/trunk/gemrb/plugins/Core/Interface.h 2008-10-05 17:49:26 UTC (rev 5400)
@@ -334,9 +334,9 @@
Video * GetVideoDriver() const;
ResourceMgr * GetResourceMgr() const;
/* returns a newly created string */
- char * GetString(ieStrRef strref, ieDword options = 0);
+ char * GetString(ieStrRef strref, ieDword options = 0) const;
/* makes sure the string is freed in TLKImp */
- void FreeString(char *&str);
+ void FreeString(char *&str) const;
void FreeInterface(void * ptr);
Factory * GetFactory() const;
/* sets the floattext color */
@@ -392,21 +392,21 @@
/** returns the textarea of the main game screen */
TextArea *GetMessageTextArea() const;
/** returns a string reference from a string reference index constant*/
- ieStrRef GetStringReference(int stridx);
+ ieStrRef GetStringReference(int stridx) const;
/** displays any string in the textarea */
- void DisplayString(const char *txt);
+ void DisplayString(const char *txt) const;
/** displays a string constant in the textarea */
- void DisplayConstantString(int stridx, unsigned int color);
+ void DisplayConstantString(int stridx, unsigned int color) const;
/** displays a string constant followed by a number in the textarea */
- void DisplayConstantStringValue(int stridx, unsigned int color, ieDword value);
+ void DisplayConstantStringValue(int stridx, unsigned int color, ieDword value) const;
/** displays a string constant in the textarea, starting with speaker's name */
- void DisplayConstantStringName(int stridx, unsigned int color, Scriptable *speaker);
+ void DisplayConstantStringName(int stridx, unsigned int color, Scriptable *speaker) const;
/** displays a string constant in the textarea, starting with actor, and ending with target */
- void DisplayConstantStringAction(int stridx, unsigned int color, Scriptable *actor, Scriptable *target);
+ void DisplayConstantStringAction(int stridx, unsigned int color, Scriptable *actor, Scriptable *target) const;
/** displays a string in the textarea */
- void DisplayString(int stridx, unsigned int color, ieDword flags);
+ void DisplayString(int stridx, unsigned int color, ieDword flags) const;
/** displays a string in the textarea, starting with speaker's name */
- void DisplayStringName(int stridx, unsigned int color, Scriptable *speaker, ieDword flags);
+ void DisplayStringName(int stridx, unsigned int color, Scriptable *speaker, ieDword flags) const;
/** returns the Window Visible Flag */
int GetVisible(unsigned short WindowIndex) const;
/** Set a Window Visible Flag */
Modified: gemrb/trunk/gemrb/plugins/Core/ScrollBar.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/ScrollBar.cpp 2008-10-05 15:36:46 UTC (rev 5399)
+++ gemrb/trunk/gemrb/plugins/Core/ScrollBar.cpp 2008-10-05 17:49:26 UTC (rev 5400)
@@ -32,7 +32,7 @@
State = 0;
ResetEventHandler( ScrollBarOnChange );
ta = NULL;
- for(int i=0;i<6;i++) {
+ for(int i=0;i<SB_RES_COUNT;i++) {
Frames[i]=NULL;
}
}
@@ -40,13 +40,15 @@
ScrollBar::~ScrollBar(void)
{
Video *video=core->GetVideoDriver();
- for(int i=0;i<6;i++) {
+ for(int i=0;i<SB_RES_COUNT;i++) {
if(Frames[i]) {
video->FreeSprite(Frames[i]);
}
}
}
+/** Sets a new position, relays the change to an associated textarea and calls
+ any existing GUI OnChange callback */
void ScrollBar::SetPos(int NewPos)
{
if (Pos && ( Pos == NewPos )) {
@@ -64,6 +66,7 @@
RunEventHandler( ScrollBarOnChange );
}
+/** Refreshes the ScrollBar according to a guiscript variable */
void ScrollBar::RedrawScrollBar(const char* Variable, int Sum)
{
if (strnicmp( VarName, Variable, MAX_VARIABLE_LENGTH )) {
@@ -72,6 +75,7 @@
SetPos( Sum );
}
+/** Mousewheel support */
void ScrollBar::ScrollUp()
{
if (Pos > 0) {
@@ -79,6 +83,7 @@
}
}
+/** Mousewheel support */
void ScrollBar::ScrollDown()
{
if ( (ieDword) Pos + 1 < Value ) {
@@ -86,6 +91,7 @@
}
}
+/** Draws the ScrollBar control */
void ScrollBar::Draw(unsigned short x, unsigned short y)
{
if (!Changed && !(Owner->Flags&WF_FLOAT) ) {
@@ -135,9 +141,10 @@
true );
}
+/** Sets a ScrollBar GUI resource */
void ScrollBar::SetImage(unsigned char type, Sprite2D* img)
{
- if (type > IE_GUI_SCROLLBAR_SLIDER) {
+ if (type >= SB_RES_COUNT) {
return;
}
if (Frames[type]) {
@@ -146,6 +153,7 @@
Frames[type] = img;
Changed = true;
}
+
/** Mouse Button Down */
void ScrollBar::OnMouseDown(unsigned short x, unsigned short y,
unsigned short Button, unsigned short /*Mod*/)
@@ -212,6 +220,7 @@
SetPos( aftst );
}
}
+
/** Mouse Button Up */
void ScrollBar::OnMouseUp(unsigned short /*x*/, unsigned short /*y*/,
unsigned short /*Button*/, unsigned short /*Mod*/)
@@ -219,6 +228,7 @@
Changed = true;
State = 0;
}
+
/** Mouse Over Event */
void ScrollBar::OnMouseOver(unsigned short /*x*/, unsigned short y)
{
@@ -269,6 +279,7 @@
}
}
+/** Sets the ScrollBarOnChange event (guiscript callback) */
bool ScrollBar::SetEvent(int eventType, const char *handler)
{
Changed = true;
Modified: gemrb/trunk/gemrb/plugins/Core/ScrollBar.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/ScrollBar.h 2008-10-05 15:36:46 UTC (rev 5399)
+++ gemrb/trunk/gemrb/plugins/Core/ScrollBar.h 2008-10-05 17:49:26 UTC (rev 5400)
@@ -66,6 +66,8 @@
* Widget displaying scrollbars for paging in long text windows
*/
+#define SB_RES_COUNT 6
+
class GEM_EXPORT ScrollBar : public Control {
public:
ScrollBar(void);
@@ -80,7 +82,7 @@
void Draw(unsigned short x, unsigned short y);
private: //Private attributes
/** Images for drawing the Scroll Bar */
- Sprite2D* Frames[6];
+ Sprite2D* Frames[SB_RES_COUNT];
/** Cursor Position */
unsigned short Pos;
/** Scroll Bar Status */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|