Dennis Schridde
74bb1a185b
Revert r4061 (accidential commit)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4062 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 15:04:27 +00:00
Dennis Schridde
7e93a664b8
Move packaging -> pkg
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4061 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 14:57:35 +00:00
Freddie Witherden
36027bc88b
Cleanup of startGameOptionsMenu (frontend.c). There should be no functional changes.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4060 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 14:06:15 +00:00
Giel van Schijndel
3b6dc21b22
Don't include lib/sqlite3 in the Doxygen generated documentation
...
(as we can just use the SQLite documentation for that)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4059 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 14:06:03 +00:00
Giel van Schijndel
ca7787333f
Slight reduction of code-duplication and make sure __not__ to return before cleaning up our resources
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4058 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 13:46:57 +00:00
Giel van Schijndel
7311b8f4b2
* Add a new resource type (for use with .wrf files): DBBODY which is similar to SBODY, with as difference that instead of a CSV file it specifies an SQLite database file to load from
...
* Add the code to load bodies from the `body` table of the given database file (function `loadBodyStatsFromDB`)
* This code will make sure to load the body stats-data in a similar manner (i.e. the resulting data in-memory should be the same) to the body.txt loading code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4057 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 13:37:05 +00:00
Giel van Schijndel
cc70b07ccd
Use the default VFS and don't hardcode on "physfs"
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4056 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 12:27:35 +00:00
Dennis Schridde
e32e928c38
Remove missing ftol() and add some docs
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4055 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 11:40:35 +00:00
Giel van Schijndel
cac17150d3
* Convert the `propulsion.txt` and `bodypropulsionimd.txt` stats to the SQLite database
...
This addresses #2 ( http://trac.wz2100.net/ticket/2 )
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4052 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 22:11:00 +00:00
Dennis Schridde
0316bee001
Remove original backdrops (ugly) and wzlogo 3, 4 and rename the others to backdropX
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4046 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 19:31:42 +00:00
Dennis Schridde
3e9cb44a88
frend -> frontend (makes mods which add files to the WRF incompatible!)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4045 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 19:22:40 +00:00
Dennis Schridde
cb2f0a30df
Patch MSVC Solution file to depend on SQLite and change eol-style to native for them, since otherwise patches will not apply.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4044 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 18:16:04 +00:00
Dennis Schridde
8b42f591b4
Update for french from qwerty800 (7%)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4043 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 11:54:04 +00:00
Giel van Schijndel
283c8715f7
--disable-debug when building a Debian package (prevents nasty warnings resulting from type-punning causing the compilation process to quit)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4042 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 10:33:11 +00:00
Dennis Schridde
f2351935ac
Preliminary french translation by qwerty800 (5%)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4038 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 23:27:44 +00:00
Per Inge Mathisen
a71086a039
Prune dead code, and do not bother to dynamically allocate memory to save 12 bytes per polygon.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4037 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:46:29 +00:00
Per Inge Mathisen
d5687a6bce
Only set the colour for a model once, not once for every vertex. It does not vary.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4036 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:10:57 +00:00
Per Inge Mathisen
7693909947
Kill oddball type TERRAIN_VERTEXF (never used for terrain!) and reduce copying some more.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4035 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:03:50 +00:00
Freddie Witherden
3bb71c1b3e
Hopefully fix the size of the logo in frend.img.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4034 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 19:59:59 +00:00
Per Inge Mathisen
3bcd4f7d1d
Kill PIEPOLY and reduce a lot of silly copying of variables back and forth for each polygon.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4033 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 19:44:57 +00:00
Per Inge Mathisen
a8f88483ac
Fix bug in OpenGL lighting mode which would mess up GUI. Also do not
...
recalculate the surface normal for every polygon for every frame! It
is already calculated when we load the PIE model, so let's use it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4032 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 19:09:44 +00:00
Per Inge Mathisen
5f31a354f3
Do not enable and disable GL_LIGHTING for every polygon when lighting mode is enabled.
...
Reorganize the drawing code a bit to make it more obvious how the calls go.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4031 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 18:52:09 +00:00
Per Inge Mathisen
4b7f572ba4
Simplify pie_Polygon() since we never draw polygons of less than 3 vertices.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4030 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 18:32:45 +00:00
Dennis Schridde
06ba564918
update-po and add preliminary russian translation by Terminator (1%)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4029 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 18:27:12 +00:00
Dennis Schridde
ad6603dffa
Reformat pickADroid and also make sure that we don't block an exit point by not incrementing maxtries
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4028 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 17:57:16 +00:00
Giel van Schijndel
09e97515f0
Apply patch `weapons-stats-sqlite.diff` from #2 ( http://trac.wz2100.net/ticket/2 ):
...
* Add a new resource type (for use with .wrf files): DBWEAPON which is similar to SWEAPON, with as difference that instead of a CSV file it specifies an SQLite database file to load from
* Add the code to load weapons from the `weapons` table of the given database file
* This code will make sure to load the weapon stats-data in a similar manner (i.e. the resulting data in-memory should be the same) to the weapons.txt loading code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4027 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 16:21:26 +00:00
Per Inge Mathisen
f80e30643b
pie2wzm: Handle the no-cull PIE flag by adding an extra polygon that faces
...
the opposite way. This way we can enable backface culling all the time.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4026 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 21:26:43 +00:00
Per Inge Mathisen
f9d2a9152d
Remove PIE_ALPHA. Revert most of r4023, since some parts of the drawing code
...
did not handle alpha blending too well, and blended solids in some cases.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4025 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 21:07:26 +00:00
Per Inge Mathisen
169e5bcc42
Drastically reduce the number of (spurious) state changes per frame.
...
Doubles frames per second drawn here.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4024 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 20:14:25 +00:00
Per Inge Mathisen
d4e10b07e9
Do not care what blending state we are in when drawing simple and solid
...
graphics additions like lines and boxes to cut down on state changes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4023 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:56:34 +00:00
Per Inge Mathisen
4004ce9872
Clean up in rendering modes. Remove unuseful pie_SetColourCombine().
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4022 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:41:33 +00:00
Per Inge Mathisen
83ddfb7b99
Small cleanup of the screen flip code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4021 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:29:24 +00:00
Giel van Schijndel
26326762f7
The NSIS script is __not__ executable
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4017 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 14:59:13 +00:00
Giel van Schijndel
a73f0de08a
Const correctness
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4016 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 20:29:45 +00:00
Giel van Schijndel
76f9cfdeed
Register the PhysicsFS implementation of the SQLite VFS class as the default SQLite VFS when starting
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4015 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 20:13:40 +00:00
Giel van Schijndel
c996eed64a
Cleanup
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4014 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 20:07:20 +00:00
Per Inge Mathisen
1ef5b2202b
Generalize the damage function and move some common variables between the various
...
object types into the base object type. This also makes the recently added minimum
damage change apply to structures and features as well. See patch #1000 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4013 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 17:47:24 +00:00
Giel van Schijndel
1dac4a46a2
Split schema and data up into seperate SQL files
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4012 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 15:57:04 +00:00
Dennis Schridde
303895e5fb
Mark all BASE_OBJECT "derived" types as WZ_DECL_MAY_ALIAS (they may alias with any type).
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4011 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 15:53:45 +00:00
Dennis Schridde
fa416b55e3
Minor cleanup
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4010 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 15:44:11 +00:00
Giel van Schijndel
fde3dff8ff
Modify function `orderStateObj`:
...
* return a pointer instead of writing it to an output parameter
* return NULL on failure instead of FALSE (and as such the above pointer on success)
This removes some type-punning warnings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4009 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 14:44:03 +00:00
Dennis Schridde
d58ef8fa12
Workaround stupid autoconf CFLAGS default
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4008 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 11:25:20 +00:00
Dennis Schridde
bb5206dac7
update-po and add italian translation preview by doom3r with 35% percent coverage
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4006 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 00:14:36 +00:00
Giel van Schijndel
a42740f02d
Add player[1234567].[vs]lo to the ignore list for Aivolution's autogenerated files
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4005 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 23:10:12 +00:00
Giel van Schijndel
08e68d9c54
Don't initalise the 'file' pointer with itself
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4004 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 23:06:00 +00:00
Giel van Schijndel
dd0655b915
Make sure that xFullPathname uses SQLITE_OK as its return value for success (and SQLITE_IOERR for failure)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4003 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 23:05:38 +00:00
Giel van Schijndel
add956c36d
Change all 'trailGfx' columns that where '0' to NULL instead
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4002 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 22:58:02 +00:00
Roman C
5d2c9bb3ae
When of the target is bigger than weapon damage the final damage is calculated as follows: damage / 3. It prevents situations when weapons with high ROF stop dealing any damage to their targets.
...
This addresses bug #11191 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4000 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 17:38:11 +00:00
Giel van Schijndel
c4a62d5139
Rename sqlite3.diff to sqlite3.5.4.diff and update it to be a diff against r3997
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3999 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 17:00:31 +00:00
Giel van Schijndel
fa47b4ff72
Revert r3997 (we now have the original 3.5.4 in SVN history, at r3997)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3998 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 16:57:11 +00:00