Revision: 7138
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=7138&view=rev
Author: gitsvngateway
Date: 2009-04-22 23:41:07 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
Merge branch 'master' into lua2
* master: (84 commits)
Introduce ASSERT_OR_RETURN, a macro to assert on an expression, and assert()
and then return if it fails,
The commit to fix the unsigned int underflow (ticket 404) had as unfortunate
side effect that building was possible even when out of power. This fixes it.
Make BinaryProtocol more flexible to allow it to work with 2.0+ as well as
the 2.2 lobby protocol (depending on what parameter was used during
construction)
Move the Game, Protocol classes to files of their own (to allow them to be
reused by the IRC bot, instead of duplicating code)
Be extra careful with the buildpoints, as the signed <-> unsigned stuff might
have caused problems. This should fix ticket #404.
Move the IRC bot to the same directory as the lobby server
Whatever way we leave the bot's mainloop, make sure to terminate the lobby
checking thread
Don't use Python 2.6 specific syntax (r7123)
* Catch and handle all socket errors, not just timeouts
excise the codebase from some C99 format specifiers.
Fix #400:
* Notify all served IRC channels when shutting down
* Rename the "help" command to "about"
* Move construction of BotCommands to its own class (__init__)
* Pass the IRC write function as a lambda to BotCommands' functions
Properly store the gameFormat struct description in the class
* Add channel operator support
* Send replies only to the channel from which the request came
Don't call the IRC command handling function in the try block (we don't want
to protect against errors inside the IRC command function)
Add multi-channel support to wzlobbybot, one list of channels in which to
serve requests, another just to be present in.
...
From: Git SVN Gateway <[email protected]>
Modified Paths:
--------------
branches/lua2/.gitignore
branches/lua2/data/base/images/frontend.img
branches/lua2/data/base/images/frontend4.png
branches/lua2/data/mp/wrf/frontend.wrf
branches/lua2/lib/betawidget/configure.ac
branches/lua2/lib/betawidget/src/Makefile.am
branches/lua2/lib/framework/configfile.c
branches/lua2/lib/framework/configfile.h
branches/lua2/lib/framework/debug.h
branches/lua2/lib/framework/frame.c
branches/lua2/lib/framework/frame.h
branches/lua2/lib/framework/frameint.h
branches/lua2/lib/framework/input.c
branches/lua2/lib/framework/lexer_input.c
branches/lua2/lib/framework/lexer_input.h
branches/lua2/lib/ivis_opengl/screen.c
branches/lua2/lib/netplay/netplay.c
branches/lua2/lib/netplay/netplay.h
branches/lua2/lib/netplay/nettypes.c
branches/lua2/lib/sound/oggvorbis.c
branches/lua2/src/action.c
branches/lua2/src/aiexperience.c
branches/lua2/src/configuration.c
branches/lua2/src/configuration.h
branches/lua2/src/console.c
branches/lua2/src/console.h
branches/lua2/src/display3d.c
branches/lua2/src/droid.c
branches/lua2/src/droiddef.h
branches/lua2/src/effects.c
branches/lua2/src/effects.h
branches/lua2/src/feature.c
branches/lua2/src/feature.h
branches/lua2/src/frend.h
branches/lua2/src/game.c
branches/lua2/src/game.h
branches/lua2/src/intdisplay.c
branches/lua2/src/keybind.c
branches/lua2/src/keyedit.c
branches/lua2/src/loop.c
branches/lua2/src/main.c
branches/lua2/src/map.h
branches/lua2/src/mission.c
branches/lua2/src/mission.h
branches/lua2/src/multiint.c
branches/lua2/src/multiint.h
branches/lua2/src/multijoin.c
branches/lua2/src/multijoin.h
branches/lua2/src/multimenu.c
branches/lua2/src/multiplay.c
branches/lua2/src/multisync.c
branches/lua2/src/order.c
branches/lua2/src/power.c
branches/lua2/src/power.h
branches/lua2/src/scriptfuncs.c
branches/lua2/src/seqdisp.c
branches/lua2/src/structure.c
branches/lua2/src/structure.h
branches/lua2/src/terrain.c
branches/lua2/src/warzoneconfig.c
branches/lua2/src/warzoneconfig.h
branches/lua2/tests/Makefile.am
branches/lua2/tools/gitsvngateway/gitsvngateway
branches/lua2/tools/masterserver/wzmasterserver.py
branches/lua2/tools/masterserver/wztest.py
Added Paths:
-----------
branches/lua2/tools/masterserver/client.py
branches/lua2/tools/masterserver/game.py
branches/lua2/tools/masterserver/ircbot.py
branches/lua2/tools/masterserver/protocol.py
Removed Paths:
-------------
branches/lua2/tools/lobby/client.py
branches/lua2/tools/lobby/ircbot.py
Property Changed:
----------------
branches/lua2/tools/masterserver/wzmasterserver.py
branches/lua2/tools/masterserver/wztest.py
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
