Last change
on this file since 10512 was
8858,
checked in by landauf, 13 years ago
|
merged output branch back to trunk.
Changes:
- you have to include util/Output.h instead of util/Debug.h
- COUT(x) is now called orxout(level)
- output levels are now defined by an enum instead of numbers. see util/Output.h for the definition
- it's possible to use output contexts with orxout(level, context). see util/Output.h for some common contexts. you can define more contexts
- you must use 'endl' at the end of an output message, '\n' does not flush the message
Output levels:
- instead of COUT(0) use orxout()
- instead of COUT(1) use orxout(user_error) or orxout(internal_error)
- instead of COUT(2) use orxout(user_warning) or orxout(internal_warning)
- instead of COUT(3) use orxout(user_status/user_info) or orxout(internal_status/internal_info)
- instead of COUT(4) use orxout(verbose)
- instead of COUT(5) use orxout(verbose_more)
- instead of COUT(6) use orxout(verbose_ultra)
Guidelines:
- user_* levels are for the user, visible in the console and the log-file
- internal_* levels are for developers, visible in the log-file
- verbose_* levels are for debugging, only visible if the context of the output is activated
Usage in C++:
- orxout() << "message" << endl;
- orxout(level) << "message" << endl;
- orxout(level, context) << "message" << endl;
Usage in Lua:
- orxout("message")
- orxout(orxonox.level.levelname, "message")
- orxout(orxonox.level.levelname, "context", "message")
Usage in Tcl (and in the in-game-console):
- orxout levelname message
- orxout_context levelname context message
- shortcuts: log message, error message, warning message, status message, info message, debug message
|
-
Property svn:eol-style set to
native
|
File size:
2.3 KB
|
Rev | Line | |
---|
[2710] | 1 | # |
---|
| 2 | # ORXONOX - the hottest 3D action shooter ever to exist |
---|
| 3 | # > www.orxonox.net < |
---|
| 4 | # |
---|
| 5 | # This program is free software; you can redistribute it and/or |
---|
| 6 | # modify it under the terms of the GNU General Public License |
---|
| 7 | # as published by the Free Software Foundation; either version 2 |
---|
| 8 | # of the License, or (at your option) any later version. |
---|
| 9 | # |
---|
| 10 | # This program is distributed in the hope that it will be useful, |
---|
| 11 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
| 12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
| 13 | # GNU General Public License for more details. |
---|
| 14 | # |
---|
| 15 | # You should have received a copy of the GNU General Public License along |
---|
| 16 | # with this program; if not, write to the Free Software Foundation, |
---|
| 17 | # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
---|
| 18 | # |
---|
| 19 | |
---|
| 20 | SET_SOURCE_FILES(NETWORK_SRC_FILES |
---|
[1505] | 21 | Client.cc |
---|
| 22 | ClientConnection.cc |
---|
[2087] | 23 | ClientConnectionListener.cc |
---|
[3214] | 24 | Connection.cc |
---|
[7490] | 25 | FunctionCall.cc |
---|
[3084] | 26 | FunctionCallManager.cc |
---|
[1735] | 27 | GamestateManager.cc |
---|
[7801] | 28 | #GamestateClient.cc |
---|
[1735] | 29 | GamestateHandler.cc |
---|
[7163] | 30 | LANDiscoverable.cc |
---|
| 31 | LANDiscovery.cc |
---|
[7801] | 32 | WANDiscoverable.cc |
---|
| 33 | WANDiscovery.cc |
---|
| 34 | MasterServerComm.cc |
---|
[3084] | 35 | NetworkFunction.cc |
---|
| 36 | Host.cc |
---|
[1505] | 37 | Server.cc |
---|
[7801] | 38 | MasterServer.cc |
---|
| 39 | PeerList.cc |
---|
| 40 | ServerList.cc |
---|
[3214] | 41 | ServerConnection.cc |
---|
[2662] | 42 | TrafficControl.cc |
---|
[1505] | 43 | ) |
---|
[5695] | 44 | |
---|
| 45 | SET_SOURCE_FILES(NETWORK_HDR_FILES |
---|
| 46 | Client.h |
---|
| 47 | ClientConnection.h |
---|
| 48 | ClientConnectionListener.h |
---|
| 49 | Connection.h |
---|
[7490] | 50 | FunctionCall.h |
---|
[5695] | 51 | FunctionCallManager.h |
---|
[7801] | 52 | #GamestateClient.h |
---|
[5695] | 53 | GamestateHandler.h |
---|
| 54 | GamestateManager.h |
---|
| 55 | Host.h |
---|
[7163] | 56 | LANDiscoverable.h |
---|
| 57 | LANDiscovery.h |
---|
[7801] | 58 | WANDiscoverable.h |
---|
| 59 | WANDiscovery.h |
---|
| 60 | MasterServerComm.h |
---|
[8858] | 61 | NetworkChatListener.h |
---|
[5695] | 62 | NetworkFunction.h |
---|
| 63 | NetworkPrecompiledHeaders.h |
---|
| 64 | NetworkPrereqs.h |
---|
| 65 | Server.h |
---|
[7801] | 66 | MasterServer.h |
---|
| 67 | PeerList.h |
---|
| 68 | ServerList.h |
---|
[5695] | 69 | ServerConnection.h |
---|
| 70 | TrafficControl.h |
---|
| 71 | ) |
---|
| 72 | |
---|
[2710] | 73 | ADD_SUBDIRECTORY(packet) |
---|
| 74 | ADD_SUBDIRECTORY(synchronisable) |
---|
[1505] | 75 | |
---|
[3196] | 76 | ORXONOX_ADD_LIBRARY(network |
---|
[7163] | 77 | TOLUA_FILES |
---|
| 78 | Client.h |
---|
| 79 | LANDiscovery.h |
---|
[7801] | 80 | WANDiscovery.h |
---|
[3196] | 81 | PCH_FILE |
---|
| 82 | NetworkPrecompiledHeaders.h |
---|
| 83 | LINK_LIBRARIES |
---|
| 84 | ${ZLIB_LIBRARY} |
---|
[7459] | 85 | #${ENET_LIBRARY} |
---|
| 86 | enet_orxonox |
---|
[3196] | 87 | ${Boost_THREAD_LIBRARY} |
---|
[8351] | 88 | ${CEGUI_TOLUA_LIBRARY} |
---|
[3196] | 89 | util |
---|
| 90 | core |
---|
| 91 | SOURCE_FILES |
---|
[5695] | 92 | ${NETWORK_SRC_FILES} ${NETWORK_HDR_FILES} |
---|
[1505] | 93 | ) |
---|
Note: See
TracBrowser
for help on using the repository browser.