From: <ave...@us...> - 2009-08-17 20:54:53
|
Revision: 6913 http://gemrb.svn.sourceforge.net/gemrb/?rev=6913&view=rev Author: avenger_teambg Date: 2009-08-17 20:54:42 +0000 (Mon, 17 Aug 2009) Log Message: ----------- changed SetText to SetName Modified Paths: -------------- gemrb/trunk/gemrb/plugins/CREImporter/CREImp.cpp gemrb/trunk/gemrb/plugins/Core/Actions.cpp gemrb/trunk/gemrb/plugins/Core/Actor.cpp gemrb/trunk/gemrb/plugins/Core/Actor.h gemrb/trunk/gemrb/plugins/Core/GSUtils.cpp gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp Modified: gemrb/trunk/gemrb/plugins/CREImporter/CREImp.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/CREImporter/CREImp.cpp 2009-08-17 20:43:53 UTC (rev 6912) +++ gemrb/trunk/gemrb/plugins/CREImporter/CREImp.cpp 2009-08-17 20:54:42 UTC (rev 6913) @@ -556,7 +556,7 @@ name[32]=0; tmpDword = *(ieDword *) name; if (tmpDword != 0 && tmpDword !=1) { - act->SetText( name, 0 ); //setting longname + act->SetName( name, 0 ); //setting longname } str->ReadDword( &offset); str->ReadDword( &size); @@ -709,11 +709,11 @@ str->ReadDword( &act->LongStrRef ); //Beetle name in IWD needs the allow zero flag char* poi = core->GetString( act->LongStrRef, IE_STR_ALLOW_ZERO ); - act->SetText( poi, 1 ); //setting longname + act->SetName( poi, 1 ); //setting longname free( poi ); str->ReadDword( &act->ShortStrRef ); poi = core->GetString( act->ShortStrRef ); - act->SetText( poi, 2 ); //setting shortname (for tooltips) + act->SetName( poi, 2 ); //setting shortname (for tooltips) free( poi ); act->BaseStats[IE_VISUALRANGE] = 30; //this is just a hack act->BaseStats[IE_DIALOGRANGE] = 15; //this is just a hack Modified: gemrb/trunk/gemrb/plugins/Core/Actions.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Actions.cpp 2009-08-17 20:43:53 UTC (rev 6912) +++ gemrb/trunk/gemrb/plugins/Core/Actions.cpp 2009-08-17 20:54:42 UTC (rev 6913) @@ -3822,7 +3822,7 @@ return; } Actor* target = ( Actor* ) tar; - target->SetText(parameters->int0Parameter,1); + target->SetName(parameters->int0Parameter,1); } void GameScript::SetRegularName(Scriptable* Sender, Action* parameters) @@ -3832,7 +3832,7 @@ return; } Actor* target = ( Actor* ) tar; - target->SetText(parameters->int0Parameter,2); + target->SetName(parameters->int0Parameter,2); } /** this is a gemrb extension */ Modified: gemrb/trunk/gemrb/plugins/Core/Actor.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-08-17 20:43:53 UTC (rev 6912) +++ gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-08-17 20:54:42 UTC (rev 6913) @@ -388,7 +388,7 @@ DefaultButtons[2]=slot3; } -void Actor::SetText(const char* ptr, unsigned char type) +void Actor::SetName(const char* ptr, unsigned char type) { size_t len = strlen( ptr ) + 1; //32 is the maximum possible length of the actor name in the original games @@ -403,7 +403,7 @@ } } -void Actor::SetText(int strref, unsigned char type) +void Actor::SetName(int strref, unsigned char type) { if (type!=2) { if (LongName) free(LongName); @@ -5410,8 +5410,8 @@ { Actor *newActor = new Actor(); - newActor->SetText(GetName(0),0); - newActor->SetText(GetName(1),1); + newActor->SetName(GetName(0),0); + newActor->SetName(GetName(1),1); memcpy(newActor->BaseStats, BaseStats, sizeof(BaseStats) ); //IF_INITIALIZED shouldn't be set here, yet Modified: gemrb/trunk/gemrb/plugins/Core/Actor.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Actor.h 2009-08-17 20:43:53 UTC (rev 6912) +++ gemrb/trunk/gemrb/plugins/Core/Actor.h 2009-08-17 20:54:42 UTC (rev 6913) @@ -398,8 +398,8 @@ return which ? SmallPortrait : LargePortrait; } - void SetText(const char* ptr, unsigned char type); - void SetText(int strref, unsigned char type); + void SetName(const char* ptr, unsigned char type); + void SetName(int strref, unsigned char type); /* returns carried weight atm, could calculate with strength*/ int GetEncumbrance(); /* checks on death of actor, returns true if it should be removed*/ Modified: gemrb/trunk/gemrb/plugins/Core/GSUtils.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/GSUtils.cpp 2009-08-17 20:43:53 UTC (rev 6912) +++ gemrb/trunk/gemrb/plugins/Core/GSUtils.cpp 2009-08-17 20:54:42 UTC (rev 6913) @@ -689,8 +689,8 @@ tar->SetBase(IE_COLORS+i, src->GetStat(IE_COLORS+i) ); } } - tar->SetText(src->GetName(0),0); - tar->SetText(src->GetName(1),1); + tar->SetName(src->GetName(0),0); + tar->SetName(src->GetName(1),1); //add more attribute copying } Modified: gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp 2009-08-17 20:43:53 UTC (rev 6912) +++ gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp 2009-08-17 20:54:42 UTC (rev 6913) @@ -4568,7 +4568,7 @@ if (!MyActor) { return RuntimeError( "Actor not found!" ); } - MyActor->SetText(Name, Which); + MyActor->SetName(Name, Which); MyActor->SetMCFlag(MC_EXPORTABLE,BM_OR); Py_INCREF( Py_None ); return Py_None; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |