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
Dennis Schridde
86cb5ff6d5
Cleanup effects (mostly const correctness)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6750 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 19:41:44 +00:00
Dennis Schridde
7e795ebf9f
Const correctness (IMDs are never modified in bucket3d functions)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6749 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 19:41:40 +00:00
Dennis Schridde
a3f46201bb
Fix out-of-source build: Relative paths to srcdir were double applied
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6748 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 19:41:20 +00:00
Per Inge Mathisen
9d986d917f
map2ldn: Fix conversion error. Reported by Mysteryem.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6739 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 09:44:32 +00:00
Buginator
119f48163f
Add Asserts() to catch the bad player value
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6738 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 05:17:41 +00:00
Buginator
fc8bbc5bd9
Feature fixes & enhancements.
...
*Adds LOG_FEATURE (--debug feature) so we can keep track of features.
*Disallow VTOLs from being able to poach features.
*Changes feature spawning from instant to a variable time period.
*When feature can't be placed, break out of routine instead of sending invalid data.
*Actually remove features, and notify others that the feature was removed. (AKA, actually sync between machines.)
ASSERT() when numNaybors is invalid.
Fix a spamming debug line mistakenly changed in r6677
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6737 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 03:36:26 +00:00
Buginator
df0ada9a50
Fixes crash when certain scripts fail to compile, it don't allocate storage, so we shouldn't (try to) reference / free() it.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6736 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 02:17:20 +00:00
Buginator
19852d694c
Changes big tabs to smaller tabs when you have many maps.
...
(It would crash after showing 4 'pages')
NOTE, if we have *lots* of maps (more than 7 pages), added ASSERT, so we will know we need to port over the scroll tab modifications to this routine as well.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6735 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 02:11:33 +00:00
Buginator
f4fb5a269b
Fixes issue with max / min player bug in host screen.
...
Basically, when you pick a 2/4/8p map, we didn't save that info along with the map. This resulted in possibly starting 2/4/8p games with the wrong number of players set. (ie, 8p map with 4 players, or 2p map with 4 players)
Closes ticket #10 (I think it was 10--trac is down)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6734 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 02:04:09 +00:00
Buginator
ca447ad076
Fixes crash issue when psWeapStats is still set to NULL (on init), when this pointer was referenced again.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6733 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 01:47:47 +00:00
Buginator
f0d0bd7ebe
Fixes a dangling pointer issue with a global.
...
In certain circumstances, if you try to abort out of a MP game (maybe SP as well), it would crash after deleting the widget, since it was still referencing the pointer in the global.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6732 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 01:40:19 +00:00
Per Inge Mathisen
7b8e81ed8f
map2lnd: Tons of bugfixes thanks to some help by Mysteryem. It is hardcoded to use Arizona at the moment, though.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6731 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-27 22:24:37 +00:00
Per Inge Mathisen
09ddf35b87
mapinfo: Parse .gam file and show scroll limits.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6730 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-26 23:17:05 +00:00
Per Inge Mathisen
08e9bd5efa
Initial map to LND format converter from patch #787 : LND format exporter, now as a separate
...
application. It has not been tested with editworld yet. Needs some TLC.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6729 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-26 22:10:57 +00:00
Per Inge Mathisen
58546965b7
Delete commented out references to non-existent files from gamedesc.lev
...
Delete two unused and broken map files that either belongs to an expand mission or is unreferenced.
Add basic unit testing framework for testing all map files in data/base.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6728 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-26 19:41:25 +00:00
Per Inge Mathisen
be34651386
A simple map inspection tool
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6727 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-24 22:12:49 +00:00
Giel van Schijndel
df35bb7cbe
debug_console isn't a function anymore (it's a macro) so don't declare it as a function anymore
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6726 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-24 12:48:01 +00:00
Gerard Krol
104df92a88
Close the file when an error occurs while loading a map. PhysFS likes that. Gotoified from a patch by Buginator.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6725 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 22:44:54 +00:00
Gerard Krol
22dd8d58f6
Make sure that the left edge of the radar stays a fixed distance from the edge of the screen when increasing the size of the radar.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6724 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 22:31:31 +00:00
Gerard Krol
f7e9028969
Fix bug 278 (On C2M3 the map overlays are offset the terrain map). The scroll limits were not being taken into account for drawing the viewing window and the radar
...
blips.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6723 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 22:04:03 +00:00
Gerard Krol
73f68dcc55
Shift the lightmap half a tile so the red light will be centered on the landing lights again.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6722 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 20:05:42 +00:00
Gerard Krol
fb2b2559ba
Fix a bug introduced in r6719 that caused an attempt to draw an off-map sector, which resulted in an assert.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6721 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 19:19:22 +00:00
Gerard Krol
10ce0cc72b
Scale down textures used for 3D when they exceed the size specified with the textureSize option. Also add two assert statements to check for the correct handling of the parameters for glDrawRangeElements.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6720 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 18:56:41 +00:00
Gerard Krol
6b1432d1e6
Clean up the glDrawRangeElements code and respect GL_MAX_ELEMENTS_VERTICES and GL_MAX_ELEMENTS_INDICES by reducing the sector size and not appending calls
...
when the limits would be exceeded. This probably will fix the crashes people with intel cards were having.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6719 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 14:03:34 +00:00
Dennis Schridde
b15ac97eeb
Fixup ChangeLog sections
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6718 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 13:31:35 +00:00
Gerard Krol
0cebae9c43
When the tileset is not set, default to Arizona (this fixes the map preview).
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6715 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 12:00:17 +00:00
Giel van Schijndel
baa232a17c
aiexperience:
...
* Make functions not used outside of aiexperience.c static
* Remove unused functions
* Compose paths using sasprintf instead of nasty string manipulation with sstrcpy and sstrcat
* Some general clean up to increase code readability
* Move some variables into the most local scope where they where used
* Use a for-loop instead of a while loop and put all the looping logic in the for () statement
* Reduce several series (in functions CanRememberPlayer\w+Loc) of if-statements to a single logic statement with logical ands
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6714 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 01:26:18 +00:00
Giel van Schijndel
1849c5e721
* Rename printf_console to debug_console because it only prints messages to the ingame console in debug builds
...
* Define debug_console in terms of console()
- debug_console does ''exactly'' the same as console() with the exception of debug_console doing nothing in non-debug builds, so #define debug_console to console() on debug builds and nothing on non-debug builds
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6711 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 00:21:46 +00:00
Giel van Schijndel
f4c0ad23f0
Change global var oilResFeature to what it's used as: a pointer to a FEATURE_STATS containing the oil resource's stats
...
The previous variable contained an integer indexing into an array to point to the same stat
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6710 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-23 00:21:42 +00:00
Giel van Schijndel
ab5e599100
Don't use the deprecated git-$command interface anymore, instead use "git $command"
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6707 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-22 23:42:07 +00:00
Guangcong Luo
0d07f77411
Fix "you found power" message sent to players who weren't supposed to see it
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6705 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-22 22:22:17 +00:00