[Orxonox-commit 2441] r7148 - in code/branches/presentation3: data/levels src/libraries/core src/libraries/network/packet src/libraries/util
adrfried at orxonox.net
adrfried at orxonox.net
Sun Jun 13 22:56:15 CEST 2010
Author: adrfried
Date: 2010-06-13 22:56:15 +0200 (Sun, 13 Jun 2010)
New Revision: 7148
Modified:
code/branches/presentation3/data/levels/Quest_PirateAttack.oxw
code/branches/presentation3/src/libraries/core/XMLPort.h
code/branches/presentation3/src/libraries/network/packet/ClassID.cc
code/branches/presentation3/src/libraries/util/SignalHandler.cc
Log:
Typos fixed (recIEved ?\226?\134?\146 recEIved)
Modified: code/branches/presentation3/data/levels/Quest_PirateAttack.oxw
===================================================================
--- code/branches/presentation3/data/levels/Quest_PirateAttack.oxw 2010-06-12 10:39:14 UTC (rev 7147)
+++ code/branches/presentation3/data/levels/Quest_PirateAttack.oxw 2010-06-13 20:56:15 UTC (rev 7148)
@@ -56,7 +56,7 @@
<subquests>
<GlobalQuest id="3159b4d4-bc86-4190-ba1d-4530668dfe31">
<QuestDescription title="The stolen stick..."
- description="Now you can see it: There are more pirates... the pirates you killed were only a small part of the whole fleet. You recieved a message from your Headquarter: The pirates have stolen
+ description="Now you can see it: There are more pirates... the pirates you killed were only a small part of the whole fleet. You received a message from your Headquarter: The pirates have stolen
a very important memory stick with secret infos (military locations etc.), the holy stick. You must get it back! Otherwise the humans are in great danger..."
failmessage=""
completeMessage="Unbelievable, you annihilated all pirates and got the stolen memory stick.
Modified: code/branches/presentation3/src/libraries/core/XMLPort.h
===================================================================
--- code/branches/presentation3/src/libraries/core/XMLPort.h 2010-06-12 10:39:14 UTC (rev 7147)
+++ code/branches/presentation3/src/libraries/core/XMLPort.h 2010-06-13 20:56:15 UTC (rev 7148)
@@ -196,7 +196,7 @@
@param sectionname The name of the subsection in the XML file that encloses the sub-objects ("" means no subsection)
@param loadfunction The function to add a new object to the class
@param loadfunction The function to get all added objects from the class
- @param xmlelement The XMLElement (recieved through the XMLPort function)
+ @param xmlelement The XMLElement (received through the XMLPort function)
@param mode The mode (load/save) (received through the XMLPort function)
@param bApplyLoaderMask If this is true, an added sub-object gets loaded only if it's class is included in the Loaders ClassTreeMask (this is usually false)
@param bLoadBefore If this is true, the sub-object gets loaded (through XMLPort) BEFORE it gets added to the main class (this is usually true)
Modified: code/branches/presentation3/src/libraries/network/packet/ClassID.cc
===================================================================
--- code/branches/presentation3/src/libraries/network/packet/ClassID.cc 2010-06-12 10:39:14 UTC (rev 7147)
+++ code/branches/presentation3/src/libraries/network/packet/ClassID.cc 2010-06-13 20:56:15 UTC (rev 7148)
@@ -144,7 +144,7 @@
id=ClassByString( std::string((const char*)classname) );
COUT(3) << "processing classid: " << networkID << " name: " << classname << " id: " << id << std::endl;
if(id==NULL){
- COUT(0) << "Recieved a bad classname" << endl;
+ COUT(0) << "Received a bad classname" << endl;
abort();
}
id->setNetworkID( networkID );
Modified: code/branches/presentation3/src/libraries/util/SignalHandler.cc
===================================================================
--- code/branches/presentation3/src/libraries/util/SignalHandler.cc 2010-06-12 10:39:14 UTC (rev 7147)
+++ code/branches/presentation3/src/libraries/util/SignalHandler.cc 2010-06-13 20:56:15 UTC (rev 7148)
@@ -123,7 +123,7 @@
// if the signalhandler has already been destroyed then don't do anything
if( SignalHandler::singletonPtr_s == 0 )
{
- COUT(0) << "recieved signal " << sigName.c_str() << std::endl << "can't write backtrace because SignalHandler already destroyed" << std::endl;
+ COUT(0) << "received signal " << sigName.c_str() << std::endl << "can't write backtrace because SignalHandler already destroyed" << std::endl;
exit(EXIT_FAILURE);
}
@@ -133,7 +133,7 @@
}
- COUT(0) << "recieved signal " << sigName.c_str() << std::endl << "try to write backtrace to file orxonox_crash.log" << std::endl;
+ COUT(0) << "received signal " << sigName.c_str() << std::endl << "try to write backtrace to file orxonox_crash.log" << std::endl;
int sigPipe[2];
if ( pipe(sigPipe) == -1 )
More information about the Orxonox-commit
mailing list