Commit Graph

5406 Commits (73ba9f3a1a7c0a3796f1732c0632661a79d01bcd)

Author SHA1 Message Date
Per Inge Mathisen 73ba9f3a1a Correct water edges on little egypt map. Fix by Mysteryem. Closes gna.org bug #9658.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6826 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-09 18:28:17 +00:00
Gerard Krol 21011fd176 Accept DORDER_NONE as a valid order to the orderDroid script function, needed for the BecomePrey AI. (committed for Buginator)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6823 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-09 17:15:44 +00:00
Per Inge Mathisen 571d7e0329 make check: Also test included mod maps.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6821 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 18:02:39 +00:00
Per Inge Mathisen 3905de35cb When playing Mayhem mode, burning scavengers can crash (or rather, lead to assert failure)
the game because they may have nowhere to run when burning, and may trigger checks because 
they die while doing orders ("burn out"). The former should be properly fixed in scripts 
by always setting retreat coordinates, and the latter is rather bad design, but not 
changing it now.  Close bug #296. Reviewed by Gerard.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6820 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 17:57:44 +00:00
Per Inge Mathisen 7a9da735e2 map2lnd: Fix bug in setting the number of objects in the exported map.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6818 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 17:15:14 +00:00
Per Inge Mathisen b8268b2370 mapinfo: Correct for structure padding. Now we can parse savegame structures, too.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6817 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 17:06:11 +00:00
Per Inge Mathisen 48ff63c9d1 map2lnd: Export structures as well.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6816 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 16:52:17 +00:00
Per Inge Mathisen eb14b8753d map2lnd: Support exporting droids.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6815 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 15:11:54 +00:00
Per Inge Mathisen eb8329e481 mapinfo: Read droid data for editworld maps (not savegames).
mapinfo: Calculate number of players by checking construction droids.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6814 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 14:19:28 +00:00
Dennis Schridde c18c426c73 Fix a crash when loading savegames by loading effects earlier
This works around a crash discovered when loading the savegame attached
 to #196 by loading effects earlier, which will initialise the effects
 system before we try to add new effects.
This is by no means an optimal fix, but given the messed-up state of game.c
 it was the fastest and most simple solution for the given issue.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6813 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 13:34:26 +00:00
Gerard Krol ab549ac68d Only enable the backdrop when pausing the game for both the design screen and the intelligence screen. This fixes bug 295.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6812 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 12:40:42 +00:00
Dennis Schridde d655d548f4 Effect memory pool cleanup
I played a bit with implementing a better memory pool for effects and this
 is what came out.

Major changes:
Allocates in chunks of 10k effects, uses free/used lists to speed up search
 for free and updates of active effects.

Benefits:
 * Unlimited number of effects possible.
 * Faster
   Not (yet) benchmarked, but logic dictates that iterating over MAX_EFFECTS
   is slower than iterating over just the number of active effects.

(Patch as posted to mailinglist.)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6807 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 11:45:08 +00:00
Per Inge Mathisen 4f27904b35 Remove two unused files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6806 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 22:15:37 +00:00
Guangcong Luo ba8608f40d Spelling corrections.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6804 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 22:03:22 +00:00
Per Inge Mathisen 3fd2879d6a mapinfo: Fix crash on some failures upon trying to close already closed file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6803 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 21:52:34 +00:00
Guangcong Luo c39e294a75 Commit Rebalance 0.3.0.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6801 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 21:28:18 +00:00
Per Inge Mathisen 42d5809ae5 Move the RPM spec file where it belongs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6800 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 20:46:49 +00:00
Per Inge Mathisen cbdff3e45d Update backdrops by cathuria with new versions. Closes ticket #287.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6798 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 19:08:26 +00:00
Per Inge Mathisen c8dcde2182 map2lnd: Fix bug in positioning of features. Thanks again to Mysteryem for debugging help.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6797 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 18:57:41 +00:00
Per Inge Mathisen 9dbcf2dca1 Implement more robust error handling. Sanity check feature coordinates.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6796 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 18:47:07 +00:00
Per Inge Mathisen 9271cf015e Oops. Fix blooper while editing framework build system.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6794 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 18:19:59 +00:00
Per Inge Mathisen b7d637634f Remove grim and newst tiles from build system as well.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6793 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 18:17:30 +00:00
Per Inge Mathisen 5da9b30f7d Fix missing files in makefiles so that 'make dist' can be run again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6792 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 18:09:58 +00:00
Per Inge Mathisen 0fc9820f4a Add RPM spec file for building Warzone. Tested on Fedora 10.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6791 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 17:21:18 +00:00
Per Inge Mathisen 4b4bd5cf7e With the new terrain renderer, the grim and newst tilesets make no sense anymore, so removing them.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6790 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 17:11:23 +00:00
Per Inge Mathisen 6c7c24e5f4 Forgot one line to Changelog in trunk
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6789 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 14:50:08 +00:00
Per Inge Mathisen e26e35cf49 Update ChangeLog
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6787 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 14:48:31 +00:00
Per Inge Mathisen 788bd21477 map2lnd: Read tileset type and use it to determine which tileset is being exported. Also export all features.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6783 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 14:20:20 +00:00
Per Inge Mathisen ecdb16baea Fix "make check" compilation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6782 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 14:18:52 +00:00
Dennis Schridde ffcf206972 MSVC supports noreturn as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6780 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-06 14:52:22 +00:00
Dennis Schridde 58897d42be Report OpenGL 3.0 support during initialisation as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6779 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-06 14:40:27 +00:00
Dennis Schridde 6c1bafbf77 Use macro to check for MSVC .NET
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6778 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-06 14:40:19 +00:00
Dennis Schridde c0acc342bb Add more documentation to WZ_DECL_*, use __ attribute names as recommended by GNU for headers, reorder defintions logically
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6777 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-06 14:40:08 +00:00
Dennis Schridde 4c3053b3e1 "restrict" is a C99 feature, thus use the appropriate checks
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6776 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-06 14:39:59 +00:00
Dennis Schridde 8aacce716c Provide noreturn declaration macro (useful for exit-on-failure functions)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6775 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-06 14:39:19 +00:00
Gerard Krol 47f89c7fc6 Clean up the videoLoop and backdrop enabling/disabling code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6769 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-03 21:55:33 +00:00
Per Inge Mathisen 28c7cb4abb Add new backdrop by B. V. Edwards <cathuria>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6768 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-02 22:57:26 +00:00
Per Inge Mathisen a31fe8a6ec mapinfo: Add function to deduce a given map's tileset from the terrain type info.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6767 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-02 19:40:31 +00:00
Per Inge Mathisen a348f2683b map2lnd: Convert gateway information.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6766 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-02 18:53:08 +00:00
Per Inge Mathisen 5e1895ac70 Branch merge in oil drum fix from 2.2 in r6764.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6765 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 23:50:18 +00:00
Freddie Witherden 677c52277e Remove some long-dead code in function.c.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6761 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 18:29:30 +00:00
Freddie Witherden 559cf3edb2 Fix stats under OS X.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6759 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 13:11:42 +00:00
Freddie Witherden 34323e368a Fix compilation of SQLite under OS X. Stats are still broken.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6758 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 13:06:59 +00:00
Per Inge Mathisen 17733f3946 map2lnd: Reuse physfs aux code from framework. More generic handling of partially big endian ported savegames. Initial support for features.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6757 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 12:44:54 +00:00
Dennis Schridde d8680df439 Bump internal copy of SQLite to 3.6.11
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6756 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 10:05:59 +00:00
Per Inge Mathisen 8f3a5ab23d map2lnd: Update documentation some more with info from Editworld. Clean up the messy source a bit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6755 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 01:21:29 +00:00
Per Inge Mathisen 28df89817c map2lnd: Fix documentation of map logic.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6754 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 00:58:41 +00:00
Per Inge Mathisen bed64f33e9 map2lnd: Fix geometry
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6753 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 00:25:13 +00:00
Dennis Schridde cf10a5f45d More cleanup of effects
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6752 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 19:41:52 +00:00
Dennis Schridde bba65f6361 Unify spelling of effect setup functions
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6751 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 19:41:48 +00:00