immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed "Inappropariate bot"->"Inappropariate object" in newly added functions

dev-ui
krzys-h 2013-05-18 18:29:07 +02:00
parent b65196c17f
commit 7662f312b3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/global.h
View File

@ -107,6 +107,7 @@ enum Error
ERR_VEH_VIRUS = 400, //! < vehicle infected by a virus ERR_VEH_VIRUS = 400, //! < vehicle infected by a virus
ERR_BAT_VIRUS = 401, //! < building infected by a virus ERR_BAT_VIRUS = 401, //! < building infected by a virus
ERR_DESTROY_NOTFOUND = 410, //! < not found anything to destroy ERR_DESTROY_NOTFOUND = 410, //! < not found anything to destroy
ERR_WRONG_OBJ = 420, //! < inappropriate vehicle
ERR_VEH_POWER = 500, //! < no battery ERR_VEH_POWER = 500, //! < no battery
ERR_VEH_ENERGY = 501, //! < more energy ERR_VEH_ENERGY = 501, //! < more energy
ERR_FLAG_FLY = 510, //! < impossible in flight ERR_FLAG_FLY = 510, //! < impossible in flight

1
src/common/restext.cpp
View File

@ -624,6 +624,7 @@ void InitializeRestext()
stringsErr[ERR_FLAG_PROXY] = "Too close to an existing flag"; stringsErr[ERR_FLAG_PROXY] = "Too close to an existing flag";
stringsErr[ERR_FLAG_DELETE] = "No flag nearby"; stringsErr[ERR_FLAG_DELETE] = "No flag nearby";
stringsErr[ERR_DESTROY_NOTFOUND]= "Not found anything to destroy"; stringsErr[ERR_DESTROY_NOTFOUND]= "Not found anything to destroy";
stringsErr[ERR_WRONG_OBJ] = "Inappropriate object";
stringsErr[ERR_MISSION_NOTERM] = "The mission is not accomplished yet (press \\key help; for more details)"; stringsErr[ERR_MISSION_NOTERM] = "The mission is not accomplished yet (press \\key help; for more details)";
stringsErr[ERR_DELETEMOBILE] = "Bot destroyed"; stringsErr[ERR_DELETEMOBILE] = "Bot destroyed";
stringsErr[ERR_DELETEBUILDING] = "Building destroyed"; stringsErr[ERR_DELETEBUILDING] = "Building destroyed";

6
src/script/script.cpp
View File

@ -538,7 +538,7 @@ bool CScript::rBusy(CBotVar* thisclass, CBotVar* var, CBotVar* result, int& exce
if ( automat != nullptr ) if ( automat != nullptr )
result->SetValInt(automat->GetBusy()); result->SetValInt(automat->GetBusy());
else else
exception = ERR_MANIP_VEH; exception = ERR_WRONG_OBJ;
return true; return true;
} }
@ -571,7 +571,7 @@ bool CScript::rDestroy(CBotVar* thisclass, CBotVar* var, CBotVar* result, int& e
{ {
err = automat->StartAction(0); err = automat->StartAction(0);
} else } else
err = ERR_MANIP_VEH; err = ERR_WRONG_OBJ;
if ( err != ERR_OK ) if ( err != ERR_OK )
{ {
@ -728,7 +728,7 @@ bool CScript::rFactory(CBotVar* thisclass, CBotVar* var, CBotVar* result, int& e
else else
err = ERR_BUILD_DISABLED; err = ERR_BUILD_DISABLED;
} else } else
err = ERR_MANIP_VEH; err = ERR_WRONG_OBJ;
if ( err != ERR_OK ) if ( err != ERR_OK )
{ {