Commit Graph

3427 Commits (5540146c923555169232c68d908697d4abb34060)

Author SHA1 Message Date
Christian Ohm 3dbd10b277 Add newlines to two files to shut up gcc.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4109 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 14:23:44 +00:00
Dennis Schridde 81f54bdbfd We should add those files we #include...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4108 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 12:56:45 +00:00
Dennis Schridde 2537bfc61c Cleanup #includes a bit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4107 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 12:39:08 +00:00
Giel van Schijndel 59e2d655d7 Use the database (i.e. SQLite) stats implementations on single player
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4106 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 12:29:17 +00:00
Per Inge Mathisen 50481359e1 Fix warning due to missing include
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4105 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 12:27:07 +00:00
Per Inge Mathisen 5c360cab12 Remove dead code related to the RESOURCE_NAMES define. patch #1006 by EvilGuru.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4104 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 11:59:29 +00:00
Per Inge Mathisen 1b9ef4f995 Remove hardcoded map visibility size from the ivis_opengl code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4103 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 11:05:08 +00:00
Per Inge Mathisen 3a05848aa4 Slight cleanup for lighting.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4102 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 10:32:15 +00:00
Dennis Schridde 1addc30f14 Port r4099: Properly uninstall on windows
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4101 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 03:32:15 +00:00
Dennis Schridde a3d8cdbdb2 New include order in frame.h. This should fix msvc problems hopefully.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4096 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 03:10:05 +00:00
Dennis Schridde 9e38b3c9f0 Port r4093 and r4094 from 2.1: Cleanup frame.c headers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4095 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 02:46:03 +00:00
Dennis Schridde 8a56874464 Update changelog
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4092 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 01:15:06 +00:00
Dennis Schridde b2e288a65e Update changelogs from branches/2.1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4087 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 00:50:55 +00:00
Giel van Schijndel cc0c897d47 Add i18n.[ch] to the raw makefile system and the Code::Blocks projectfile
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4084 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 00:20:35 +00:00
Giel van Schijndel 146d51755a Fix up raw makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4083 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 00:06:11 +00:00
Giel van Schijndel d72edf6dee * Add a new resource type (for use with .wrf files): DBBRAIN which is similar to SBRAIN, with as difference that instead of a CSV file it specifies an SQLite database file to load from
* Add the code to load brains from the brain table of the given database file (function `loadBrainStatsFromDB`)
  * This code will make sure to load the brain stats-data in a similar manner (i.e. the resulting data in-memory should be the same) to the brain.txt loading code

This addresses #2 ( http://trac.wz2100.net/ticket/2 )


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4082 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 23:56:08 +00:00
Freddie Witherden 1be90e0811 Fix an error in the previous commit which caused Warzone not to compile. Sorry about that.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4079 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 18:36:28 +00:00
Freddie Witherden c473294251 Cleanup the buildModule function in droid.c. There should be no functional changes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4078 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 18:27:59 +00:00
Dennis Schridde a80115b63e Port r4075: Fix "array subscribt is above array bounds"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4076 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:58:04 +00:00
Dennis Schridde fe1a470ca1 Actually add the i18n.[ch] files...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4073 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:53:10 +00:00
Giel van Schijndel 984d3e1000 Move duplicated code in separate functions
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4069 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:41:45 +00:00
Dennis Schridde a5643b359c Move i18n stuff into i18n.[ch] and cleanup headers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4068 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:36:50 +00:00
Giel van Schijndel c8f2efc618 Clean up data.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4067 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:20:12 +00:00
Dennis Schridde 9f5168e9dd Some generic cleanup-style things
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4066 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:05:15 +00:00
Dennis Schridde 02fb26efff Adapt autotools build to r4062
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4065 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:03:58 +00:00
Dennis Schridde 44ec7c2d28 Install fr,it,ru on Windows, too
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4064 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:03:16 +00:00
Dennis Schridde 4342fd1226 Move packaging -> pkg
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4063 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 15:07:32 +00:00
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