Changeset 7148 for code/branches/presentation3
- Timestamp:
- Jun 13, 2010, 10:56:15 PM (14 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/data/levels/Quest_PirateAttack.oxw
r7103 r7148 57 57 <GlobalQuest id="3159b4d4-bc86-4190-ba1d-4530668dfe31"> 58 58 <QuestDescription title="The stolen stick..." 59 description="Now you can see it: There are more pirates... the pirates you killed were only a small part of the whole fleet. You rec ieved a message from your Headquarter: The pirates have stolen59 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 60 60 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..." 61 61 failmessage="" -
code/branches/presentation3/src/libraries/core/XMLPort.h
r6417 r7148 197 197 @param loadfunction The function to add a new object to the class 198 198 @param loadfunction The function to get all added objects from the class 199 @param xmlelement The XMLElement (rec ieved through the XMLPort function)199 @param xmlelement The XMLElement (received through the XMLPort function) 200 200 @param mode The mode (load/save) (received through the XMLPort function) 201 201 @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) -
code/branches/presentation3/src/libraries/network/packet/ClassID.cc
r6964 r7148 145 145 COUT(3) << "processing classid: " << networkID << " name: " << classname << " id: " << id << std::endl; 146 146 if(id==NULL){ 147 COUT(0) << "Rec ieved a bad classname" << endl;147 COUT(0) << "Received a bad classname" << endl; 148 148 abort(); 149 149 } -
code/branches/presentation3/src/libraries/util/SignalHandler.cc
r5738 r7148 124 124 if( SignalHandler::singletonPtr_s == 0 ) 125 125 { 126 COUT(0) << "rec ieved signal " << sigName.c_str() << std::endl << "can't write backtrace because SignalHandler already destroyed" << std::endl;126 COUT(0) << "received signal " << sigName.c_str() << std::endl << "can't write backtrace because SignalHandler already destroyed" << std::endl; 127 127 exit(EXIT_FAILURE); 128 128 } … … 134 134 135 135 136 COUT(0) << "rec ieved signal " << sigName.c_str() << std::endl << "try to write backtrace to file orxonox_crash.log" << std::endl;136 COUT(0) << "received signal " << sigName.c_str() << std::endl << "try to write backtrace to file orxonox_crash.log" << std::endl; 137 137 138 138 int sigPipe[2];
Note: See TracChangeset
for help on using the changeset viewer.