Commit Graph

5782 Commits (ef5a01eeb9c689c31099564cf92be2d5b91b504f)

Author SHA1 Message Date
Per Inge Mathisen aad6bc5341 Fix assert failure when trying to "build" demolition. Caused by either failure to reset
target stats when previous order was build and next is demolish, or when a droid is 
told to help demolish a building (hard to do because demolish is so fast, but possible).


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6986 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:04 +02:00
Per Inge Mathisen 5943e1fba1 Clean up intGetObject and improve its assert message.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6985 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:04 +02:00
Per Inge Mathisen acec2d7c6a Improve assert message in scrOrderGroupLoc when an order goes out of map bounds.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6984 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:04 +02:00
Per Inge Mathisen 5ee8538680 Improve assert message when getting the gridRemove crash.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6983 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:03 +02:00
Per Inge Mathisen c0358510d8 Add missing include
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6982 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:03 +02:00
Guangcong Luo 5c2aa2ba92 Commit patch #351: Hide resolutions smaller than Warzone supports.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6980 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
Elio Gubser c18559d219 release patterns when quit
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6979 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
Buginator c89229667b The video file (sequences.wz) is now added to the search path.
It will find the video files in data/sequences.wz  (the same location as the other .wz files that we use.)

Thanks to per for the renaming of the file on GNA.

fixes & closes ticket:322
backported from r6975



git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6978 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
Per Inge Mathisen 509a618185 Test
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6974 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
Per Inge Mathisen e6e9be70b7 Update changelog
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6973 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
Per Inge Mathisen 8b9ed44a6f New radar detector turret graphics by elio
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6972 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
Giel van Schijndel cd7edf0f88 Use a more sofisticated regular expression for channel messages to ensure we only match messages that are intented for us (i.e. the lobby IRC bot)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6968 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:12 +02:00
Giel van Schijndel 74c3180bc3 Use a regular expression to extract messages intended for us (i.e. the lobby bot) instead of string manipulation with split & find
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6967 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:12 +02:00
Giel van Schijndel 9dfa15c8f1 Move the bot to #warzone2100-games and change it's real name to indicate it's Warzone 2100 origin & purpose
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6966 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:12 +02:00
Giel van Schijndel 3fea9dcbc3 Allow announcing to work properly still
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6965 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
Giel van Schijndel eb27d5987e Comment on why the endian swapping is performed (while on the protocol level it shouldn't be needed)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6964 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
Giel van Schijndel 693a2ab4b7 Use a contextmanager and python's with-statement to manage the socket's lifetime, this guarantees exception safety
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6963 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
Giel van Schijndel 05b1e21416 Externalise code specific to querying the lobby server into a separate module
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6962 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
Giel van Schijndel acfa601182 Fix syntax error in lobby IRC bot
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6961 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
Giel van Schijndel 020b66a959 Don't use an IRC specific string representation of games
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6960 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
Giel van Schijndel d02d2a01ab Committing on behalf of and with Gerard's permission:
The initial version of the IRC bot for Warzone's lobby with the GPLv2 added.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6959 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
Per Inge Mathisen 21d89f2bb5 Test commit
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6958 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:10 +02:00
Gerard Krol 5a2ff6f410 Allow structure baseplates to have transparency. 2009-04-07 12:18:14 +02:00
Gerard Krol 3b7fbcd837 Fix an array out of bounds error (off by one) that could occur when picking up an artifact during a multiplayer game. 2009-04-06 14:25:23 +02:00
Giel van Schijndel 6bdbda9343 Allow code passing and retrieving of enums as vararg parameters in C++ as well.
In C++ enums are treated differently from integers in some cases, causing GCC to emit some rather nasty abort()-like code (x86/x64 instruction "ud2a") when used as the type for va_arg().

This was the compiler message generated:
{{{
stack.c:339: warning: ‘INTERP_TYPE’ is promoted to ‘int’ when passed through ‘...’
stack.c:339: note: (so you should pass ‘int’ not ‘INTERP_TYPE’ to ‘va_arg’)
stack.c:339: note: if this code is reached, the program will abort
}}}

NOTE: Compiling as C++ now works (as does the produced code), using: {{{./configure CC=g++ CFLAGS=-fpermissive --enable-debug=relaxed}}}

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6957 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:10 +02:00
Elio Gubser 9353874ef9 adds the base button class and imageButton class
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6956 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:09 +02:00
Per Inge Mathisen cfe68c3602 Add radar detector turret to the game. It will detect and target enemy sensors up to twice their
range away. Both land and air droids can be assigned to it. See ticket #340 for more discussion.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6955 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:09 +02:00
Freddie Witherden 4ab0f78bf4 Fix some indentation problems in hBox.[ch].
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6954 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:09 +02:00
Elio Gubser defbe884a7 fixed small bug in size fit algorithm
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6953 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:09 +02:00
Elio Gubser 959838440d fix for the same reason as r6951
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6952 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:09 +02:00
Elio Gubser e1478d46e8 don't use the helper macros before we set classInfo, as this would result in undefinied behaviour.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6951 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:08 +02:00
Elio Gubser adfc6f2aa8 added some asserts and improved commentaries
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6950 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:08 +02:00
Elio Gubser acf512b28a fixed incorrect if-condition
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6949 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:08 +02:00
Freddie Witherden 2a9d01789a Ensure to flush/mark dirty the Cairo image surface when we draw/read from it outside of Cairo.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6948 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:08 +02:00
Freddie Witherden ded5c837d0 Add Pixman to the Xcode project. Currently unused/untested.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6947 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:08 +02:00
Gerard Krol 90edf63fd2 Don't show smoke for a building that is under construction. 2009-04-03 22:39:38 +02:00
Gerard Krol 6b817fbcf5 Display both the health and build progress of a building that is under construction. 2009-04-03 22:37:36 +02:00
Gerard Krol 510b18497e Structures start at 10% health and gain more during construction. 2009-04-03 22:21:22 +02:00
Gerard Krol 55b2652b6c Replace spaces by tabs in structureDemolish. 2009-04-03 21:55:59 +02:00
Gerard Krol ca4bf40d2f Move the demolish code to it's own function in structure.c.
Also fix a bug that caused demolish to proceed exponentially. Demolishing now takes a fifth of the time needed to construct the building.
2009-04-03 21:40:59 +02:00
Gerard Krol ddf159ca4e Move the code for constructing a structure by a droid to a separate function in structure.c 2009-04-03 21:00:50 +02:00
Elio Gubser df6647b9f5 adds the patternManager for betawidget. take a look at sdl-testapp.lua for usage example
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6946 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-03 18:53:12 +02:00
Freddie Witherden 6b641069df Support resizing of widgets with OpenGL content.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6945 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-03 18:53:12 +02:00
Freddie Witherden cab53fcbfb Add OpenGL support to betawidget.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6944 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-03 18:53:12 +02:00
Guangcong Luo 8dcdfe5665 Add myself to AUTHORS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6942 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-03 18:53:12 +02:00
Guangcong Luo 4f1b01b4af Commit Rebalance 0.4.1
Changelog:
- Howitzers, incendiary artillery, and T3 weapons strengthened
- All weapons have same damage upgrade progression (25%) and one of two rate upgrade progressions (10% or 15%). This is down from an average of 30% and 20%, respectively. This is intended to make weapon choice matter more.
- Cyborgs further balanced. Not only should they be usable, they should be fairly well balanced within themselves now (Next: VTOLs!)
- Ranges rounded off to multiples half-tiles, except the Wide Spectrum Sensor Turret, which is still 17.7 tiles.
- Cyborgs no longer have to be researched.
- Cyborg factory only requires Engineering now.
- Trading up weapons offers more of a benefit.
- Weapon multipliers massively rearranged.
- Cannons/Rails split from Rockets/Missiles, no longer both anti-tank.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6940 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-03 18:53:11 +02:00
Giel van Schijndel 2bca3018f4 Make sure that WZ_ASSERT_STATIC_STRING works properly in C++ as well
In fact, WZ_ASSERT_STATIC_STRING should now work on ''all'' valid C++ compilers.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6930 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-03 18:53:11 +02:00
Git SVN Gateway bc074e1ed2 Merge commit 'per/master'
* commit 'per/master':
  Fix ticket #293: Crashes in netlog code.
2009-03-30 16:13:17 +02:00
Giel van Schijndel 54abb2ad7c * Don't use "touch" on Windows, as Windows doesn't have that command
- Instead use "echo file > file"

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6927 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:59 +02:00
Guangcong Luo 0644e25415 Commit patch #323 (Fix divide-by-zero crash when null pointer passed to getDroidDestination).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6923 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:59 +02:00